fix: misc fixes — deprecated logRetention, Korean strings, gitignore cleanup

.gitignore

@@ -21,12 +21,21 @@ slides/*.pdf
 # IDE
 .idea/
 .vscode/
+.kiro/
+.claude/
 *.swp
 *.swo
 
 # OS
 .DS_Store
 Thumbs.db
 
+# Logs
+*.log
+npm-debug.log*
+
+# Coverage
+coverage/
+
 # References (cloned repos for study)
-references/
+references/

packages/cdk/__tests__/stacks.e2e.test.ts

@@ -212,10 +212,18 @@ describe("CDK Stacks E2E — synth all stacks", () => {
   // ── ApiStack ──
 
   describe("ApiStack", () => {
-    it("7+ Lambda functions (including prewarm + log retention custom resources)", () => {
-      // 7 handler functions + 1 custom resource for log retention
+    it("7 Lambda functions", () => {
       const functions = apiTemplate.findResources("AWS::Lambda::Function");
-      expect(Object.keys(functions).length).toBeGreaterThanOrEqual(7);
+      expect(Object.keys(functions).length).toBe(7);
+    });
+
+    it("7 CloudWatch log groups with ONE_WEEK retention", () => {
+      const logGroups = apiTemplate.findResources("AWS::Logs::LogGroup");
+      expect(Object.keys(logGroups).length).toBe(7);
+      for (const [, lg] of Object.entries(logGroups)) {
+        const props = (lg as Record<string, unknown>).Properties as Record<string, unknown>;
+        expect(props).toHaveProperty("RetentionInDays", 7);
+      }
     });
 
     it("WebSocket API", () => {
@@ -236,10 +244,8 @@ describe("CDK Stacks E2E — synth all stacks", () => {
 
     it("Handler Lambda functions use ARM64", () => {
       const functions = apiTemplate.findResources("AWS::Lambda::Function");
-      for (const [id, fn] of Object.entries(functions)) {
+      for (const [, fn] of Object.entries(functions)) {
         const props = (fn as Record<string, unknown>).Properties as Record<string, unknown>;
-        // Skip log retention custom resource Lambda (managed by CDK)
-        if (id.includes("LogRetention")) continue;
         expect(props).toHaveProperty("Architectures", ["arm64"]);
       }
     });

packages/cdk/lib/stacks/api-stack.ts

@@ -94,19 +94,26 @@ export class ApiStack extends cdk.Stack {
       architecture: lambda.Architecture.ARM_64,
       memorySize: 256,
       timeout: cdk.Duration.seconds(30),
-      logRetention: logs.RetentionDays.ONE_WEEK,
       projectRoot: monorepoRoot,
       depsLockFilePath: path.join(monorepoRoot, "package-lock.json"),
       bundling: bundlingDefaults,
     };
 
+    const makeLogGroup = (id: string, name: string) =>
+      new logs.LogGroup(this, id, {
+        logGroupName: `/aws/lambda/${name}`,
+        retention: logs.RetentionDays.ONE_WEEK,
+        removalPolicy: cdk.RemovalPolicy.DESTROY,
+      });
+
     // ── Lambda Functions ──
 
     const wsConnectFn = new NodejsFunction(this, "WsConnectFn", {
       ...nodejsFunctionDefaults,
       functionName: "serverless-openclaw-ws-connect",
       entry: path.join(handlersDir, "ws-connect.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("WsConnectLogGroup", "serverless-openclaw-ws-connect"),
       environment: {
         ...commonEnv,
         USER_POOL_ID: props.userPool.userPoolId,
@@ -119,6 +126,7 @@ export class ApiStack extends cdk.Stack {
       functionName: "serverless-openclaw-ws-disconnect",
       entry: path.join(handlersDir, "ws-disconnect.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("WsDisconnectLogGroup", "serverless-openclaw-ws-disconnect"),
       environment: { ...commonEnv },
     });
 
@@ -127,6 +135,7 @@ export class ApiStack extends cdk.Stack {
       functionName: "serverless-openclaw-ws-message",
       entry: path.join(handlersDir, "ws-message.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("WsMessageLogGroup", "serverless-openclaw-ws-message"),
       environment: { ...commonEnv },
     });
 
@@ -135,6 +144,7 @@ export class ApiStack extends cdk.Stack {
       functionName: "serverless-openclaw-telegram-webhook",
       entry: path.join(handlersDir, "telegram-webhook.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("TelegramWebhookLogGroup", "serverless-openclaw-telegram-webhook"),
       environment: { ...commonEnv },
     });
 
@@ -143,6 +153,7 @@ export class ApiStack extends cdk.Stack {
       functionName: "serverless-openclaw-api-handler",
       entry: path.join(handlersDir, "api-handler.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("ApiHandlerLogGroup", "serverless-openclaw-api-handler"),
       environment: { ...commonEnv },
     });
 
@@ -151,6 +162,7 @@ export class ApiStack extends cdk.Stack {
       functionName: "serverless-openclaw-watchdog",
       entry: path.join(handlersDir, "watchdog.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("WatchdogLogGroup", "serverless-openclaw-watchdog"),
       environment: { ...commonEnv },
     });
 
@@ -159,6 +171,7 @@ export class ApiStack extends cdk.Stack {
       functionName: "serverless-openclaw-prewarm",
       entry: path.join(handlersDir, "prewarm.ts"),
       handler: "handler",
+      logGroup: makeLogGroup("PrewarmLogGroup", "serverless-openclaw-prewarm"),
       environment: {
         ...commonEnv,
         PREWARM_DURATION: process.env.PREWARM_DURATION ?? "60",

packages/cdk/lib/stacks/monitoring-stack.ts

@@ -80,7 +80,7 @@ export class MonitoringStack extends cdk.Stack {
     dashboard.addWidgets(
       sectionHeader(
         "Cold Start Performance",
-        "Fargate 컨테이너 시작 시간. S3 복원 → Gateway 연결 → 클라이언트 준비 단계별 소요 시간.",
+        "Fargate container startup time. Breakdown by phase: S3 restore → Gateway connection → Client ready.",
       ),
     );
 
@@ -128,7 +128,7 @@ export class MonitoringStack extends cdk.Stack {
     dashboard.addWidgets(
       sectionHeader(
         "Message Processing",
-        "사용자 메시지 → AI 응답 완료까지의 지연 시간과 응답 길이. 콜드 스타트 중 대기열 소비량.",
+        "Latency and response length from user message to AI response. Pending message consumption during cold starts.",
       ),
     );
 
@@ -172,7 +172,7 @@ export class MonitoringStack extends cdk.Stack {
     dashboard.addWidgets(
       sectionHeader(
         "Lambda Functions",
-        "Gateway Lambda 호출 수, 에러, 실행 시간. ws-message와 telegram-webhook이 핵심 핸들러.",
+        "Gateway Lambda invocations, errors, and duration. ws-message and telegram-webhook are the key handlers.",
       ),
     );
 
@@ -212,7 +212,7 @@ export class MonitoringStack extends cdk.Stack {
     dashboard.addWidgets(
       sectionHeader(
         "API Gateway",
-        "WebSocket 연결 수와 HTTP API 에러율. 4xx는 클라이언트 에러, 5xx는 서버 에러.",
+        "WebSocket connection count and HTTP API error rates. 4xx = client errors, 5xx = server errors.",
       ),
     );
 
@@ -323,7 +323,7 @@ export class MonitoringStack extends cdk.Stack {
     dashboard.addWidgets(
       sectionHeader(
         "Infrastructure — ECS & DynamoDB",
-        "Fargate 컨테이너 리소스 사용량과 DynamoDB 테이블별 읽기/쓰기 소비량.",
+        "Fargate container resource usage and DynamoDB read/write consumption per table.",
       ),
     );
 

packages/container/src/bridge.ts

@@ -56,7 +56,7 @@ export function createApp(deps: BridgeDeps): express.Express {
       try {
         let prefix = deps.getAndClearHistoryPrefix?.() ?? "";
         if (body.channel === "telegram") {
-          prefix += "[System: 마크다운 서식(**bold**, *italic*, ```code``` 등)을 사용하지 말고 순수 텍스트로 응답하세요.]\n";
+          prefix += "[System: Respond in plain text only. Do not use markdown formatting such as **bold**, *italic*, ```code```, etc.]\n";
         }
         const messageToSend = prefix ? prefix + body.message! : body.message!;
         const generator = deps.openclawClient.sendMessage(

packages/container/src/startup.ts

@@ -63,7 +63,7 @@ export async function startContainer(opts: StartContainerOptions): Promise<void>
     void notifyTelegram(
       env.TELEGRAM_BOT_TOKEN,
       telegramChatId,
-      "⚡ 컨테이너 시작됨. AI 엔진 연결 중...",
+      "⚡ Container started. Connecting to AI engine...",
     );
   }
 
@@ -81,7 +81,7 @@ export async function startContainer(opts: StartContainerOptions): Promise<void>
     void notifyTelegram(
       env.TELEGRAM_BOT_TOKEN,
       telegramChatId,
-      "✅ 준비 완료! 메시지를 처리합니다...",
+      "✅ Ready! Processing messages...",
     );
   }
 

packages/gateway/__tests__/handlers/telegram-webhook.test.ts

@@ -154,7 +154,7 @@ describe("telegram-webhook handler", () => {
       expect.anything(),
       "123456:ABC-DEF",
       "telegram:12345",
-      expect.stringContaining("깨우는 중"),
+      expect.stringContaining("Waking up"),
     );
     expect(mockRouteMessage).toHaveBeenCalled();
   });
@@ -179,7 +179,7 @@ describe("telegram-webhook handler", () => {
       expect.anything(),
       "123456:ABC-DEF",
       "telegram:12345",
-      expect.stringContaining("깨우는 중"),
+      expect.stringContaining("Waking up"),
     );
   });
 
@@ -245,14 +245,14 @@ describe("telegram-webhook handler", () => {
       expect.anything(),
       expect.any(String),
       "telegram:12345",
-      expect.stringContaining("연동 완료"),
+      expect.stringContaining("linked"),
     );
     expect(mockRouteMessage).not.toHaveBeenCalled();
   });
 
   it("should handle /link command with error", async () => {
     mockVerifyOtpAndLink.mockResolvedValueOnce({
-      error: "OTP가 만료되었거나 유효하지 않습니다.",
+      error: "OTP has expired or is invalid.",
     });
 
     const event = makeEvent(
@@ -273,7 +273,7 @@ describe("telegram-webhook handler", () => {
       expect.anything(),
       expect.any(String),
       "telegram:12345",
-      expect.stringContaining("만료"),
+      expect.stringContaining("expired"),
     );
     expect(mockRouteMessage).not.toHaveBeenCalled();
   });
@@ -297,7 +297,7 @@ describe("telegram-webhook handler", () => {
       expect.anything(),
       expect.any(String),
       "telegram:12345",
-      expect.stringContaining("사용법"),
+      expect.stringContaining("Usage"),
     );
     expect(mockVerifyOtpAndLink).not.toHaveBeenCalled();
   });
@@ -321,7 +321,7 @@ describe("telegram-webhook handler", () => {
       expect.anything(),
       expect.any(String),
       "telegram:12345",
-      expect.stringContaining("웹 UI"),
+      expect.stringContaining("Web UI"),
     );
     expect(mockRouteMessage).not.toHaveBeenCalled();
   });

packages/gateway/__tests__/services/identity.test.ts

@@ -117,7 +117,7 @@ describe("identity service", () => {
 
       const result = await verifyOtpAndLink(mockSend, "67890", "000000");
 
-      expect(result).toEqual({ error: "OTP가 만료되었거나 유효하지 않습니다." });
+      expect(result).toEqual({ error: "OTP has expired or is invalid." });
       expect(mockSend).toHaveBeenCalledTimes(1);
     });
 
@@ -137,7 +137,7 @@ describe("identity service", () => {
 
       const result = await verifyOtpAndLink(mockSend, "67890", "123456");
 
-      expect(result).toEqual({ error: "OTP가 만료되었거나 유효하지 않습니다." });
+      expect(result).toEqual({ error: "OTP has expired or is invalid." });
       expect(mockSend).toHaveBeenCalledTimes(4);
     });
 
@@ -154,7 +154,7 @@ describe("identity service", () => {
       const result = await verifyOtpAndLink(mockSend, "67890", "123456");
 
       expect(result).toEqual({
-        error: "Telegram 컨테이너가 실행 중입니다. 약 15분 후 다시 시도해주세요.",
+        error: "A Telegram container is currently running. Please try again in about 15 minutes.",
       });
       // Only 2 calls: OTP lookup + TaskState check. OTP NOT consumed.
       expect(mockSend).toHaveBeenCalledTimes(2);
@@ -175,7 +175,7 @@ describe("identity service", () => {
       const result = await verifyOtpAndLink(mockSend, "67890", "123456");
 
       expect(result).toEqual({
-        error: "이 Telegram 계정은 이미 다른 계정에 연동되어 있습니다.",
+        error: "This Telegram account is already linked to a different account.",
       });
       // Only 3 calls: OTP lookup + TaskState + existing link. OTP NOT consumed.
       expect(mockSend).toHaveBeenCalledTimes(3);
@@ -218,7 +218,7 @@ describe("identity service", () => {
       const result = await verifyOtpAndLink(mockSend, "67890", "123456");
 
       expect(result).toEqual({
-        error: "Telegram 컨테이너가 실행 중입니다. 약 15분 후 다시 시도해주세요.",
+        error: "A Telegram container is currently running. Please try again in about 15 minutes.",
       });
       // OTP NOT consumed
       expect(mockSend).toHaveBeenCalledTimes(2);

packages/gateway/src/handlers/telegram-webhook.ts

@@ -10,6 +10,7 @@ import { startTask } from "../services/container.js";
 import { sendTelegramMessage } from "../services/telegram.js";
 import { resolveUserId, verifyOtpAndLink } from "../services/identity.js";
 import { resolveSecrets } from "../services/secrets.js";
+import { invokeLambdaAgent } from "../services/lambda-agent.js";
 
 const ddb = DynamoDBDocumentClient.from(new DynamoDBClient({}));
 const ecs = new ECSClient({});
@@ -77,7 +78,7 @@ export async function handler(event: {
           fetch as never,
           botToken,
           connectionId,
-          "사용법: /link {6자리 코드}",
+          "Usage: /link {6-digit code}",
         );
       }
       return { statusCode: 200, body: "OK" };
@@ -86,7 +87,7 @@ export async function handler(event: {
     if (botToken) {
       const msg = "error" in result
         ? `❌ ${result.error}`
-        : "✅ 계정 연동 완료! 이제 웹과 Telegram이 같은 컨테이너를 공유합니다.";
+        : "✅ Account linked! Web and Telegram now share the same container.";
       await sendTelegramMessage(fetch as never, botToken, connectionId, msg);
     }
     return { statusCode: 200, body: "OK" };
@@ -99,7 +100,7 @@ export async function handler(event: {
         fetch as never,
         botToken,
         connectionId,
-        "연동 해제는 웹 UI 설정에서만 가능합니다.",
+        "Unlinking is only available from the Web UI settings.",
       );
     }
     return { statusCode: 200, body: "OK" };
@@ -117,7 +118,7 @@ export async function handler(event: {
       fetch as never,
       botToken,
       connectionId,
-      "🔄 에이전트를 깨우는 중... 잠시만 기다려주세요.",
+      "🔄 Waking up the agent... please wait.",
     );
   }
 
@@ -152,6 +153,9 @@ export async function handler(event: {
       containerName: "openclaw",
       environment: taskEnv,
     },
+    agentRuntime: (process.env.AGENT_RUNTIME as "lambda" | "fargate" | "both") ?? "fargate",
+    invokeLambdaAgent,
+    lambdaAgentFunctionArn: process.env.LAMBDA_AGENT_FUNCTION_ARN ?? "",
   });
 
   return { statusCode: 200, body: "OK" };