@dotobokuri/fleet-cli 1.16.1 → 1.17.0

package/dist/index.js

@@ -17625,13 +17625,51 @@ function buildWindowsCmdArgs(command2, args) {
   const line = [command2, ...args].map(quoteForCmd).join(" ");
   return ["/S", "/C", `"${line}"`];
 }
-var BaseConnection;
+function sanitizeDiagnosticStderrLine(value, isPemLine) {
+  const cleaned = (isPemLine ? "[REDACTED:pem_private_key]" : redactDiagnosticSecrets(value.replace(ANSI_PATTERN, "").replace(CONTROL_PATTERN, ""))).trim();
+  if (cleaned.length <= STDERR_DIAGNOSTIC_LINE_CHAR_LIMIT) {
+    return cleaned;
+  }
+  const omitted = cleaned.length - STDERR_DIAGNOSTIC_LINE_CHAR_LIMIT;
+  return `${cleaned.slice(0, STDERR_DIAGNOSTIC_LINE_CHAR_LIMIT)} [truncated ${omitted} chars]`;
+}
+function normalizePemMarkerLine(value) {
+  return value.replace(ANSI_PATTERN, "").replace(CONTROL_PATTERN, "").trim();
+}
+function redactDiagnosticSecrets(value) {
+  return SECRET_PATTERNS.reduce((text, { label, pattern }) => text.replace(pattern, `[REDACTED:${label}]`), value);
+}
+function byteLength(value) {
+  return Buffer.byteLength(value, "utf8");
+}
+var STDERR_DIAGNOSTIC_LINE_LIMIT, STDERR_DIAGNOSTIC_LINE_CHAR_LIMIT, STDERR_DIAGNOSTIC_TOTAL_BYTE_LIMIT, ANSI_PATTERN, CONTROL_PATTERN, SECRET_PATTERNS, PEM_BEGIN_PATTERN, PEM_END_PATTERN, BaseConnection;
 var init_BaseConnection = __esm({
   "../../packages/core-unified-agent/dist/connection/BaseConnection.js"() {
     "use strict";
     init_acp();
     init_env();
     init_process();
+    STDERR_DIAGNOSTIC_LINE_LIMIT = 20;
+    STDERR_DIAGNOSTIC_LINE_CHAR_LIMIT = 2e3;
+    STDERR_DIAGNOSTIC_TOTAL_BYTE_LIMIT = 8e3;
+    ANSI_PATTERN = /\x1b\[[0-?]*[ -/]*[@-~]/g;
+    CONTROL_PATTERN = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g;
+    SECRET_PATTERNS = [
+      { label: "aws_access_key", pattern: /AKIA[0-9A-Z]{16}/g },
+      { label: "github_token", pattern: /gh[psour]_[A-Za-z0-9]{36}/g },
+      { label: "jwt", pattern: /eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g },
+      { label: "openai_key", pattern: /\bsk-[A-Za-z0-9_-]{20,}\b/g },
+      {
+        label: "generic_secret",
+        pattern: /\b[A-Z0-9_]*(?:KEY|TOKEN|SECRET|PASSWORD|CREDENTIAL)[A-Z0-9_]*\s*[:=]\s*["']?[^\s"']+["']?/gi
+      },
+      {
+        label: "pem_private_key",
+        pattern: /-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]+?-----END [A-Z ]*PRIVATE KEY-----/g
+      }
+    ];
+    PEM_BEGIN_PATTERN = /-----BEGIN [A-Z ]*PRIVATE KEY-----/;
+    PEM_END_PATTERN = /-----END [A-Z ]*PRIVATE KEY-----/;
     BaseConnection = class extends EventEmitter {
       constructor(options2) {
         super();
@@ -17640,6 +17678,8 @@ var init_BaseConnection = __esm({
         this.acpStream = null;
         this.childExitPromise = null;
         this.stderrBuffer = "";
+        this.diagnosticStderrTail = [];
+        this.inPemBlock = false;
         this.command = options2.command;
         this.args = options2.args;
         this.cwd = options2.cwd;
@@ -17765,9 +17805,29 @@ var init_BaseConnection = __esm({
         if (!message) {
           return;
         }
+        this.recordDiagnosticStderrLine(message);
         this.emit("log", message);
         this.emit("logEntry", this.createStructuredLogEntry(message));
       }
+      /** 실패 메시지에 붙일 수 있는 짧고 마스킹된 stderr tail을 반환합니다. */
+      getStderrDiagnosticTail() {
+        return this.diagnosticStderrTail.join("\n");
+      }
+      /** 원본 에러에 stderr tail 진단을 붙여 상위 계층으로 전달합니다. */
+      withStderrDiagnostics(error51, phase) {
+        const baseError = error51 instanceof Error ? error51 : new Error(String(error51));
+        this.flushStderrBuffer();
+        const stderrTail = this.getStderrDiagnosticTail();
+        if (!stderrTail || baseError.message.includes(`${phase} stderr tail:`)) {
+          return baseError;
+        }
+        const diagnosticError = new Error(`${baseError.message}
+
+${phase} stderr tail:
+${stderrTail}`, { cause: baseError });
+        diagnosticError.name = baseError.name;
+        return diagnosticError;
+      }
       /** 기본 구조화 stderr 로그 항목을 생성합니다. */
       createStructuredLogEntry(message) {
         return {
@@ -17804,6 +17864,27 @@ var init_BaseConnection = __esm({
           })
         ]);
       }
+      recordDiagnosticStderrLine(message) {
+        const pemMarkerLine = normalizePemMarkerLine(message);
+        if (PEM_BEGIN_PATTERN.test(pemMarkerLine)) {
+          this.inPemBlock = true;
+        }
+        const inBlock = this.inPemBlock;
+        if (PEM_END_PATTERN.test(pemMarkerLine)) {
+          this.inPemBlock = false;
+        }
+        const sanitized = sanitizeDiagnosticStderrLine(message, inBlock);
+        if (!sanitized) {
+          return;
+        }
+        this.diagnosticStderrTail.push(sanitized);
+        while (this.diagnosticStderrTail.length > STDERR_DIAGNOSTIC_LINE_LIMIT) {
+          this.diagnosticStderrTail.shift();
+        }
+        while (byteLength(this.getStderrDiagnosticTail()) > STDERR_DIAGNOSTIC_TOTAL_BYTE_LIMIT && this.diagnosticStderrTail.length > 1) {
+          this.diagnosticStderrTail.shift();
+        }
+      }
     };
   }
 });
@@ -17908,7 +17989,7 @@ var init_AcpConnection = __esm({
             await this.disconnect();
           } catch {
           }
-          throw error51;
+          throw this.withStderrDiagnostics(error51, "ACP initialize");
         }
       }
       /**
@@ -17920,38 +18001,42 @@ var init_AcpConnection = __esm({
        * @returns 세션 정보
        */
       async createSession(workspace, sessionId, mcpServers, systemPrompt, strictMcp, effort) {
-        const agent = this.getAgent();
-        const servers = mcpServers ?? [];
-        let session;
-        if (sessionId) {
-          if (!agent.loadSession) {
-            throw new Error("\uC5F0\uACB0\uB41C \uC5D0\uC774\uC804\uD2B8\uAC00 session/load\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
-          }
-          const loadSessionParams = {
-            sessionId,
-            cwd: workspace,
-            mcpServers: servers
-          };
-          const meta3 = this.buildClaudeSessionMeta(systemPrompt, strictMcp, effort);
-          if (meta3) {
-            loadSessionParams._meta = meta3;
-          }
-          const loadResult = await this.withFixedTimeout(agent.loadSession(loadSessionParams), this.initTimeout, "session/load");
-          session = { ...loadResult, sessionId };
-        } else {
-          const newSessionParams = {
-            cwd: workspace,
-            mcpServers: servers
-          };
-          const meta3 = this.buildClaudeSessionMeta(systemPrompt, strictMcp, effort);
-          if (meta3) {
-            newSessionParams._meta = meta3;
+        try {
+          const agent = this.getAgent();
+          const servers = mcpServers ?? [];
+          let session;
+          if (sessionId) {
+            if (!agent.loadSession) {
+              throw new Error("\uC5F0\uACB0\uB41C \uC5D0\uC774\uC804\uD2B8\uAC00 session/load\uB97C \uC9C0\uC6D0\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4");
+            }
+            const loadSessionParams = {
+              sessionId,
+              cwd: workspace,
+              mcpServers: servers
+            };
+            const meta3 = this.buildClaudeSessionMeta(systemPrompt, strictMcp, effort);
+            if (meta3) {
+              loadSessionParams._meta = meta3;
+            }
+            const loadResult = await this.withFixedTimeout(agent.loadSession(loadSessionParams), this.initTimeout, "session/load");
+            session = { ...loadResult, sessionId };
+          } else {
+            const newSessionParams = {
+              cwd: workspace,
+              mcpServers: servers
+            };
+            const meta3 = this.buildClaudeSessionMeta(systemPrompt, strictMcp, effort);
+            if (meta3) {
+              newSessionParams._meta = meta3;
+            }
+            session = await this.withFixedTimeout(agent.newSession(newSessionParams), this.initTimeout, "session/new");
           }
-          session = await this.withFixedTimeout(agent.newSession(newSessionParams), this.initTimeout, "session/new");
+          this.setState("ready");
+          this.activeSessionId = session.sessionId;
+          return session;
+        } catch (error51) {
+          throw this.withStderrDiagnostics(error51, sessionId ? "ACP session/load" : "ACP session/new");
         }
-        this.setState("ready");
-        this.activeSessionId = session.sessionId;
-        return session;
       }
       /**
        * ACP 연결을 시작합니다.
@@ -17994,10 +18079,14 @@ var init_AcpConnection = __esm({
         if (meta3) {
           loadSessionParams._meta = meta3;
         }
-        const result = await this.withFixedTimeout(agent.loadSession(loadSessionParams), this.requestTimeout, "session/load");
-        this.activeSessionId = params.sessionId;
-        this.setState("ready");
-        return result;
+        try {
+          const result = await this.withFixedTimeout(agent.loadSession(loadSessionParams), this.requestTimeout, "session/load");
+          this.activeSessionId = params.sessionId;
+          this.setState("ready");
+          return result;
+        } catch (error51) {
+          throw this.withStderrDiagnostics(error51, "ACP session/load");
+        }
       }
       /**
        * 현재 세션을 종료합니다 (프로세스는 유지).
@@ -31081,9 +31170,9 @@ function buildJobSummaryText(prefix, status, successCount, failureCount, error51
 var HEAD_BYTE_RATIO = 0.25;
 var MAX_TEXT_CHARS = 24e3;
 var MAX_RAW_OUTPUT_CHARS = 12e3;
-var ANSI_PATTERN = /\x1b\[[0-?]*[ -/]*[@-~]/g;
-var CONTROL_PATTERN = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g;
-var SECRET_PATTERNS = [
+var ANSI_PATTERN2 = /\x1b\[[0-?]*[ -/]*[@-~]/g;
+var CONTROL_PATTERN2 = /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g;
+var SECRET_PATTERNS2 = [
   { label: "aws_access_key", pattern: /AKIA[0-9A-Z]{16}/g },
   { label: "jwt", pattern: /eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g },
   { label: "github_token", pattern: /gh[psour]_[A-Za-z0-9]{36}/g },
@@ -31165,7 +31254,7 @@ function emptyGroupPlaceholderBlock(label, timestamp) {
 function applyByteCap(blocks, maxBytes, truncatedInLabel, enableSingleBlockCharSlice = false) {
   if (!maxBytes || maxBytes <= 0) return blocks;
   const full = blocks.map((block) => renderBlock(block)).join("\n\n").trimEnd();
-  if (byteLength(full) <= maxBytes) return blocks;
+  if (byteLength2(full) <= maxBytes) return blocks;
   if (enableSingleBlockCharSlice) {
     const sliced = trySliceOversizedSingleOrHeaderPayload(blocks, maxBytes, truncatedInLabel);
     if (sliced) return sliced;
@@ -31204,7 +31293,7 @@ function trySliceOversizedSingleOrHeaderPayload(blocks, maxBytes, truncatedInLab
   if (blocks.length === 1) {
     const block = blocks[0];
     const rendered = renderBlock(block);
-    if (byteLength(rendered) <= maxBytes) return null;
+    if (byteLength2(rendered) <= maxBytes) return null;
     return sliceSingleOversizedTextBlock(block, rendered, maxBytes, truncatedInLabel);
   }
   if (blocks.length === 2 && isSerializerGroupHeaderBlock(blocks[0]) && blocks[1]?.kind === "text") {
@@ -31213,12 +31302,12 @@ function trySliceOversizedSingleOrHeaderPayload(blocks, maxBytes, truncatedInLab
     const headerRendered = renderBlock(headerBlock);
     const bodyRendered = renderBlock(payloadBlock);
     const sep = "\n\n";
-    const prefixBytes = byteLength(headerRendered) + byteLength(sep);
+    const prefixBytes = byteLength2(headerRendered) + byteLength2(sep);
     const innerBudget = maxBytes - prefixBytes;
     if (innerBudget <= 0) {
       return [headerBlock, buildCharTruncatedMarkerBlock(payloadBlock.timestamp, countCodepointsInUtf8Buffer(Buffer.from(bodyRendered, "utf8")), truncatedInLabel)];
     }
-    if (byteLength(bodyRendered) <= innerBudget) return null;
+    if (byteLength2(bodyRendered) <= innerBudget) return null;
     const { head, marker, tail } = splitRenderedUtf8AtByteCap(bodyRendered, innerBudget, truncatedInLabel);
     return [
       headerBlock,
@@ -31254,7 +31343,7 @@ function splitRenderedUtf8AtByteCap(rendered, maxBytes, charLabel) {
   if (buf.length <= maxBytes) {
     return { head: rendered, marker: "", tail: "" };
   }
-  const sepLen = byteLength("\n\n");
+  const sepLen = byteLength2("\n\n");
   let headBudget = Math.min(buf.length, Math.floor(maxBytes * HEAD_BYTE_RATIO));
   const tailBudget = Math.min(buf.length, Math.floor(maxBytes * (1 - HEAD_BYTE_RATIO)));
   for (let iter = 0; iter < 200; iter++) {
@@ -31271,7 +31360,7 @@ function splitRenderedUtf8AtByteCap(rendered, maxBytes, charLabel) {
     const marker2 = buildCharTruncatedMarker(omittedChars, charLabel);
     const headStr = buf.subarray(0, headLen2).toString("utf8");
     const tailStr = buf.subarray(tailStart2).toString("utf8");
-    const total = byteLength(headStr) + sepLen + byteLength(marker2) + sepLen + byteLength(tailStr);
+    const total = byteLength2(headStr) + sepLen + byteLength2(marker2) + sepLen + byteLength2(tailStr);
     if (total <= maxBytes) {
       return { head: headStr, marker: marker2, tail: tailStr };
     }
@@ -31279,7 +31368,7 @@ function splitRenderedUtf8AtByteCap(rendered, maxBytes, charLabel) {
     if (headBudget === 0) break;
   }
   const marker = buildCharTruncatedMarker(Math.max(1, countCodepointsInUtf8Buffer(buf) - 1), charLabel);
-  const markerTotal = byteLength(marker) + 2 * sepLen;
+  const markerTotal = byteLength2(marker) + 2 * sepLen;
   const room = Math.max(1, maxBytes - markerTotal);
   const tailBudgetFallback = Math.min(buf.length, Math.max(1, Math.floor(room * (1 - HEAD_BYTE_RATIO))));
   let tailStart = utf8SuffixStartIndex(buf, tailBudgetFallback);
@@ -31351,12 +31440,12 @@ function buildTruncatedMarker(blocks, omittedStart, omittedCount, truncatedInLab
   };
 }
 function serializedBlocksBytes(blocks) {
-  return byteLength(blocks.map((block) => renderBlock(block)).join("\n\n").trimEnd());
+  return byteLength2(blocks.map((block) => renderBlock(block)).join("\n\n").trimEnd());
 }
 function serializedBlockBytes(block, includeSeparator) {
-  return byteLength(`${includeSeparator ? "\n\n" : ""}${renderBlock(block)}`);
+  return byteLength2(`${includeSeparator ? "\n\n" : ""}${renderBlock(block)}`);
 }
-function byteLength(value) {
+function byteLength2(value) {
   return Buffer.byteLength(value, "utf8");
 }
 function toArchiveBlock(kind, source, text, label, timestamp = Date.now()) {
@@ -31387,13 +31476,13 @@ function toToolCallArchiveBlock(source, title, status, rawOutput, toolCallId, la
   };
 }
 function sanitizeArchiveText(value, maxChars = MAX_TEXT_CHARS) {
-  const cleaned = value.replace(ANSI_PATTERN, "").replace(CONTROL_PATTERN, "");
+  const cleaned = value.replace(ANSI_PATTERN2, "").replace(CONTROL_PATTERN2, "");
   if (cleaned.length <= maxChars) return cleaned;
   return `${cleaned.slice(0, maxChars)}
 [truncated ${cleaned.length - maxChars} chars]`;
 }
 function redactSecrets(value) {
-  return SECRET_PATTERNS.reduce(
+  return SECRET_PATTERNS2.reduce(
     (text, { label, pattern }) => text.replace(pattern, `[REDACTED:${label}]`),
     value
   );
@@ -32815,6 +32904,9 @@ async function runCarrierJobInBackground(opts) {
   try {
     result = await runSingleCarrier(opts);
     finalStatus = result.status;
+    if (finalStatus === "error") {
+      finalError = result.error ?? result.responseText;
+    }
   } catch (error51) {
     finalStatus = "error";
     finalError = error51 instanceof Error ? error51.message : String(error51);
@@ -43203,7 +43295,7 @@ function buildQueueIdHelp(prefix, availableIds) {
   }
   return `${prefix}. Available patch IDs: ${availableIds.join(", ")}`;
 }
-var SECRET_PATTERNS2 = [
+var SECRET_PATTERNS3 = [
   /-----BEGIN (?:RSA |EC |OPENSSH )?PRIVATE KEY-----/i,
   /\b(?:api[_-]?key|secret|password|token)\s*[:=]\s*["']?[a-z0-9_\-]{16,}/i,
   /\bghp_[a-z0-9_]{20,}\b/i,
@@ -43216,7 +43308,7 @@ var PROMPT_INJECTION_PATTERNS = [
 ];
 function findUnsafeMemoryText(content) {
   const issues = [];
-  if (SECRET_PATTERNS2.some((pattern) => pattern.test(content))) {
+  if (SECRET_PATTERNS3.some((pattern) => pattern.test(content))) {
     issues.push({
       code: "unsafe_secret",
       severity: "error",