@neurcode-ai/cli 0.9.36 → 0.9.38

package/dist/commands/ship.js

@@ -180,7 +180,7 @@ function shellTailLines(text, limit) {
         .join('\n');
 }
 function emitShipJson(payload) {
-    console.log(JSON.stringify(payload, null, 2));
+    process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
 }
 function inferStepStatus(run) {
     if (!run)
@@ -219,6 +219,7 @@ function runCliCommand(cwd, args, extraEnv, execution) {
         const timeoutMs = execution?.timeoutMs ?? getPlanTimeoutMs();
         const heartbeatMs = execution?.heartbeatMs ?? getHeartbeatIntervalMs();
         const commandLabel = execution?.label || `neurcode ${args.join(' ')}`;
+        const streamOutput = execution?.streamOutput !== false;
         const child = (0, child_process_1.spawn)(process.execPath, [getCliEntryPath(), ...args], {
             cwd,
             env: {
@@ -288,12 +289,16 @@ function runCliCommand(cwd, args, extraEnv, execution) {
         child.stdout.on('data', (chunk) => {
             const text = chunk.toString();
             stdout += text;
-            process.stdout.write(text);
+            if (streamOutput) {
+                process.stdout.write(text);
+            }
         });
         child.stderr.on('data', (chunk) => {
             const text = chunk.toString();
             stderr += text;
-            process.stderr.write(text);
+            if (streamOutput) {
+                process.stderr.write(text);
+            }
         });
         child.on('error', (error) => {
             stderr += `${error instanceof Error ? error.message : String(error)}\n`;
@@ -314,6 +319,7 @@ function runShellCommand(cwd, command, execution) {
         const timeoutMs = execution?.timeoutMs ?? getTestTimeoutMs();
         const heartbeatMs = execution?.heartbeatMs ?? getHeartbeatIntervalMs();
         const commandLabel = execution?.label || command;
+        const streamOutput = execution?.streamOutput !== false;
         const child = (0, child_process_1.spawn)(command, {
             cwd,
             env: {
@@ -382,12 +388,16 @@ function runShellCommand(cwd, command, execution) {
         child.stdout.on('data', (chunk) => {
             const text = chunk.toString();
             stdout += text;
-            process.stdout.write(text);
+            if (streamOutput) {
+                process.stdout.write(text);
+            }
         });
         child.stderr.on('data', (chunk) => {
             const text = chunk.toString();
             stderr += text;
-            process.stderr.write(text);
+            if (streamOutput) {
+                process.stderr.write(text);
+            }
         });
         child.on('error', (error) => {
             stderr += `${error instanceof Error ? error.message : String(error)}\n`;
@@ -413,20 +423,46 @@ function extractPlanId(output) {
 }
 function extractLastJsonObject(output) {
     const clean = stripAnsi(output).trim();
-    const end = clean.lastIndexOf('}');
-    if (end < 0)
+    if (!clean)
         return null;
-    let start = clean.lastIndexOf('{', end);
+    // Fast path for strict JSON mode outputs (single payload, no human preamble).
+    try {
+        return JSON.parse(clean);
+    }
+    catch {
+        // Fall through to mixed-output recovery.
+    }
+    const firstBrace = clean.indexOf('{');
+    const end = clean.lastIndexOf('}');
+    if (firstBrace >= 0 && end > firstBrace) {
+        const envelope = clean.slice(firstBrace, end + 1).trim();
+        try {
+            return JSON.parse(envelope);
+        }
+        catch {
+            // Continue with fallback scanning.
+        }
+    }
+    // Fallback: recover the longest parseable object near the tail.
+    let bestMatch = null;
+    let bestLen = -1;
+    const safeEnd = end >= 0 ? end : clean.length - 1;
+    let start = clean.lastIndexOf('{', safeEnd);
     while (start >= 0) {
-        const candidate = clean.slice(start, end + 1).trim();
+        const candidate = clean.slice(start, safeEnd + 1).trim();
         try {
-            return JSON.parse(candidate);
+            const parsed = JSON.parse(candidate);
+            if (candidate.length > bestLen) {
+                bestLen = candidate.length;
+                bestMatch = parsed;
+            }
         }
         catch {
-            start = clean.lastIndexOf('{', start - 1);
+            // Ignore parse failures and continue searching.
         }
+        start = clean.lastIndexOf('{', start - 1);
     }
-    return null;
+    return bestMatch;
 }
 function parseVerifyPayload(output) {
     const parsed = extractLastJsonObject(output);
@@ -1337,6 +1373,7 @@ async function runPlanAndApply(cwd, intent, projectId, controls) {
     }, {
         timeoutMs: getPlanTimeoutMs(),
         label: 'ship:plan',
+        streamOutput: controls?.streamOutput !== false,
     });
     const planOutput = `${planRun.stdout}\n${planRun.stderr}`;
     const parsedPlan = parsePlanPayload(planOutput);
@@ -1366,6 +1403,7 @@ async function runPlanAndApply(cwd, intent, projectId, controls) {
     const applyRun = await runCliCommand(cwd, applyArgs, undefined, {
         timeoutMs: getApplyTimeoutMs(),
         label: 'ship:apply',
+        streamOutput: controls?.streamOutput !== false,
     });
     const applyOutput = `${applyRun.stdout}\n${applyRun.stderr}`;
     const parsedApply = parseApplyPayload(applyOutput);
@@ -1380,6 +1418,11 @@ async function runPlanAndApply(cwd, intent, projectId, controls) {
     return { planId, planRun, applyRun: normalizedApplyRun, writtenFiles };
 }
 async function shipCommand(goal, options) {
+    if (options.json === true) {
+        console.log = (() => undefined);
+        console.warn = (() => undefined);
+    }
+    const streamStepOutput = options.json !== true;
     const resumedStart = options.resumeStartedAtIso ? Date.parse(options.resumeStartedAtIso) : NaN;
     const startedAt = Number.isFinite(resumedStart) && resumedStart > 0 ? resumedStart : Date.now();
     const startedAtIso = new Date(startedAt).toISOString();
@@ -1565,6 +1608,7 @@ async function shipCommand(goal, options) {
         let planningAttempt = 1;
         let initial = await runPlanAndApply(cwd, scopedGoal, options.projectId, {
             enforceDocumentationScope: documentationOnlyGoal,
+            streamOutput: streamStepOutput,
         });
         recordRunStep(auditSteps, {
             stage: 'plan',
@@ -1590,6 +1634,7 @@ async function shipCommand(goal, options) {
             planningAttempt += 1;
             initial = await runPlanAndApply(cwd, strictGoal, options.projectId, {
                 enforceDocumentationScope: true,
+                streamOutput: streamStepOutput,
             });
             recordRunStep(auditSteps, {
                 stage: 'plan',
@@ -1670,6 +1715,7 @@ async function shipCommand(goal, options) {
             : undefined, {
             timeoutMs: getVerifyTimeoutMs(),
             label: 'ship:verify',
+            streamOutput: streamStepOutput,
         });
         verifyTotalMs += verifyRun.durationMs;
         verifyExitCode = verifyRun.code;
@@ -1745,7 +1791,9 @@ async function shipCommand(goal, options) {
         }
         console.log(chalk.dim('   Falling back to constrained repair plan...'));
         const repairIntent = buildVerifyRepairIntent(normalizedGoal, currentPlanId, verifiedPayload, remediationAttemptsUsed);
-        const repair = await runPlanAndApply(cwd, repairIntent, options.projectId);
+        const repair = await runPlanAndApply(cwd, repairIntent, options.projectId, {
+            streamOutput: streamStepOutput,
+        });
         recordRunStep(auditSteps, {
             stage: 'plan',
             attempt: remediationAttemptsUsed + 1,
@@ -1889,6 +1937,7 @@ async function shipCommand(goal, options) {
             const testRun = await runShellCommand(cwd, testCommand, {
                 timeoutMs: getTestTimeoutMs(),
                 label: 'ship:tests',
+                streamOutput: streamStepOutput,
             });
             testsTotalMs += testRun.durationMs;
             testsExitCode = testRun.code;
@@ -1911,7 +1960,9 @@ async function shipCommand(goal, options) {
                 });
                 console.log(chalk.yellow(`⚠️  Test failure auto-remediation attempt ${remediationAttemptsUsed}/${maxFixAttempts}`));
                 const repairIntent = buildTestRepairIntent(normalizedGoal, currentPlanId, testOutput, remediationAttemptsUsed);
-                const repair = await runPlanAndApply(cwd, repairIntent, options.projectId);
+                const repair = await runPlanAndApply(cwd, repairIntent, options.projectId, {
+                    streamOutput: streamStepOutput,
+                });
                 recordRunStep(auditSteps, {
                     stage: 'plan',
                     attempt: remediationAttemptsUsed + 1,
@@ -1956,6 +2007,7 @@ async function shipCommand(goal, options) {
                         : undefined, {
                         timeoutMs: getVerifyTimeoutMs(),
                         label: 'ship:verify',
+                        streamOutput: streamStepOutput,
                     });
                     verifyTotalMs += verifyAfterTestRepair.durationMs;
                     recordRunStep(auditSteps, {
@@ -1982,6 +2034,7 @@ async function shipCommand(goal, options) {
                     const finalTestRun = await runShellCommand(cwd, testCommand, {
                         timeoutMs: getTestTimeoutMs(),
                         label: 'ship:tests',
+                        streamOutput: streamStepOutput,
                     });
                     testsTotalMs += finalTestRun.durationMs;
                     testsExitCode = finalTestRun.code;