elanous 0.2.40 → 0.2.41

package/src/task-orchestrator/surfaces/self-implement-pod.ts

@@ -70,7 +70,10 @@ export function recordPodSourceIoSummary(logs: string, job: string, runId: strin
   if (!ioSummary) return;
   try {
     const measured = JSON.parse(ioSummary) as Record<string, unknown>;
-    log('pod.source', 'io-summary', { job, runId, runIdSource, ...measured, hostOriginCalls });
+    const pushCounterReady = /^ELANOUS_POD_GIT_PUSH_COUNTER ready\r?$/m.test(logs);
+    const pushCalls = (logs.match(/^ELANOUS_POD_GIT_PUSH_ATTEMPT\r?$/gm) ?? []).length;
+    log('pod.source', 'io-summary', { job, runId, runIdSource, ...measured, hostOriginCalls,
+      ...(pushCounterReady ? { pushCalls } : {}) });
   } catch (error) {
     log('pod.source', 'io-summary-invalid', { job, runId, runIdSource, reason: error instanceof Error ? error.message : String(error) }, { level: 'warn' });
   }
@@ -137,7 +140,7 @@ import { ZAI_POD_EGRESS_LABEL, checkZaiPodSecret, countActiveZaiJobs, decideZaiP
 import { ZAI_CODING_DEFAULT_MODEL, ZAI_OPENROUTER_FALLBACK_MODEL, zaiSettingsFromConfig, type ZaiCodingPlanSettings } from '../../llm/zai-coding-plan.js';
 import { normalizePlanningFallbackReason, selectEnhanceLlm } from '../../prompt-enhance/enhance.js';
 import { inferProviderFromModel } from '../../llm.js';
-import { classifyPodExit, extractPodFailureReason, podChildFailureAttribution, podDeadlineResultMarker, podJobConditionReason, podTerminalRow, POD_TERMINATION_JOB_JSONPATH, POD_TERMINATION_PODS_JSONPATH, readPodTermination, type PodExitClass, type PodTermination } from './pod-failure-reason.js';
+import { classifyPodExit, extractPodFailureReason, podChildEvidenceLedgerRow, podChildFailureAttribution, podDeadlineResultMarker, podJobConditionReason, podTerminalRow, POD_TERMINATION_JOB_JSONPATH, POD_TERMINATION_PODS_JSONPATH, readPodTermination, type PodExitClass, type PodTermination } from './pod-failure-reason.js';
 import { kubectlTransientReason, retryKubectlTransient } from './kubectl-transient-retry.js';
 import { OLD_DOOR_STAMP_ENV } from '../../self-dev/old-door.js';
 import { resolveDefaultSourceHead, seedMirrorOnce, type MirrorSeedResult } from './pod-mirror-seed.js';
@@ -771,9 +774,10 @@ export function podGitPushGuardScript(runId?: string): string {
     '    *) echo "[pod] git-guard: refused push to $rref (only this run\'s branches)" >&2; exit 1 ;;',
     '  esac',
     'done',
+    'case "$2" in https://github.com/*|http://github.com/*|git@github.com:*|ssh://git@github.com/*) printf \'ELANOUS_POD_GIT_PUSH_ATTEMPT\\n\' >&2 ;; esac',
     'exit 0',
     'ELANOUS_PRE_PUSH',
-    `chmod 755 "${POD_GIT_HOOKS_DIR}/pre-push" && git config --global core.hooksPath "${POD_GIT_HOOKS_DIR}"`,
+    `chmod 755 "${POD_GIT_HOOKS_DIR}/pre-push" && git config --global core.hooksPath "${POD_GIT_HOOKS_DIR}" && printf 'ELANOUS_POD_GIT_PUSH_COUNTER ready\\n'`,
   ].join('\n');
 }
 
@@ -1604,19 +1608,42 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
     }
     if (options.siWarmAttempt) {
       const done = (async (): Promise<SelfImplementJobDone> => {
+        // POD-REUSE-REQUEST-CLEAN-FU — one fail-soft row per request decision. `runId` is the
+        // ledger partition (warm child, then parent run, then the legacy spaceId fallback);
+        // `correlationId` always names the request's spaceId. `warm-path-selected` is recorded
+        // before transport, so only the later return/quarantine row settles whether reuse completed.
+        // A ledger write failure is an observation failure only.
+        const recordWarmRequestDecision = (data: Record<string, unknown>, runId?: string) => {
+          const parentRunId = env.ELANOUS_RUN_ID;
+          const ledgerRunId = runId ?? parentRunId ?? input.spaceId;
+          const runIdSource = runId ? 'warm-child-run' : parentRunId ? 'parent-run' : 'space-id-fallback';
+          try { writeWarmLedger({ runId: ledgerRunId, event: 'pod-reuse-request-decision',
+            data: { ...data, correlationId: input.spaceId, runIdSource } }); }
+          catch (error) { debug.log('pod.reuse', 'ledger-unavailable', { spaceId: input.spaceId,
+            event: 'pod-reuse-request-decision',
+            reason: error instanceof Error ? error.message : String(error) }, { level: 'warn' }); }
+        };
         let attempt: SiWarmChildAttempt;
         try {
           const acquired = await options.siWarmAttempt!(input);
           if (!acquired) {
             // No lease was fenced: use the existing one-shot Job path.
+            recordWarmRequestDecision({ spaceId: input.spaceId, outcome: 'cold-job',
+              workerId: null, leaseId: null, generation: null, podUid: null });
             const { siWarmAttempt: _unused, siWarmHostPostprocess: _postprocess, ...coldOptions } = options;
             return podSelfImplementSpawn(coldOptions)(input).done;
           }
           attempt = acquired;
+          recordWarmRequestDecision({ spaceId: input.spaceId, outcome: 'warm-path-selected',
+            workerId: acquired.command?.workerId ?? null, leaseId: acquired.command?.leaseId ?? null,
+            generation: acquired.command?.generation ?? null, podUid: acquired.command?.podUid ?? null },
+            acquired.command?.runId);
         }
         catch (error) {
           // A lost exec reply may conceal an already opened PR. Never start another child here.
           const message = error instanceof Error ? error.message : String(error);
+          recordWarmRequestDecision({ spaceId: input.spaceId, outcome: 'acquire-failed', reason: message,
+            workerId: null, leaseId: null, generation: null, podUid: null });
           debug.log('pod.reuse', 'attempt-unavailable', { spaceId: input.spaceId, reason: message }, { level: 'warn' });
           return { exitCode: 1, output: '', error: { code: 'si-warm-reconcile-only', message } };
         }
@@ -1985,7 +2012,8 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
         return 'pool-slot-unavailable';
       };
       const recordSlotObservation = (attempt: { observationKey: string; requestedAtMs: number; requestedAt: string },
-        outcome: 'requested' | 'queued' | 'admitted' | 'rejected', reasonCode: string): void => {
+        outcome: 'requested' | 'queued' | 'admitted' | 'rejected', reasonCode: string,
+        cancellation?: { abortReason?: string; waitReason: string | null }): void => {
         const pool = options.pool;
         let occupants: Record<string, number> | null = null;
         try { occupants = pool ? pool.snapshot() : null; } catch { /* observation must not change scheduling */ }
@@ -1994,6 +2022,8 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
           observationKey: attempt.observationKey, runId: childRunId, host: resolveHostId(env),
           requestedAt: attempt.requestedAt, waitedMs: Math.max(0, slotNow() - attempt.requestedAtMs),
           queued: outcome === 'queued', poolCapacity, occupants, reasonCode, parentId: ledgerRunId, outcome,
+          ...(cancellation ? { waitReason: cancellation.waitReason,
+            ...(cancellation.abortReason === undefined ? {} : { abortReason: cancellation.abortReason }) } : {}),
         };
         debug.log('pod.slot', outcome, data, { level: outcome === 'admitted' || outcome === 'requested' ? 'info' : 'warn' });
         try {
@@ -2045,6 +2075,7 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
         const attempt = { observationKey: `${childRunId}:pod-slot:${requestedAtMs}:${++slotAttemptNumber}`,
           requestedAtMs, requestedAt: new Date(requestedAtMs).toISOString() };
         let firstSlotReasonCode: string | undefined;
+        stageReason['pool-slot'] = null;
         let slotQueuedRecorded = false;
         const stop = watchStall('pool-slot');
         // MINIH-MODE (0.2.37): the location is declared by the launch env — absent/unknown keeps the configured
@@ -2110,7 +2141,10 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
       let member: PodPoolMember | null;
       try { member = await acquireSlot(); } catch (error) { podAdmitError(error); throw error; }
       if (options.pool && !member) {
-        if (lastSlotAttempt) recordSlotObservation(lastSlotAttempt, 'rejected', lastSlotReasonCode ?? 'aborted');
+        if (lastSlotAttempt) recordSlotObservation(lastSlotAttempt, 'rejected', lastSlotReasonCode ?? 'aborted', {
+          waitReason: stageReason['pool-slot'] ?? null,
+          ...(typeof input.signal?.reason === 'string' ? { abortReason: input.signal.reason } : {}),
+        });
         exitJourneyNode('pool-admit', { provenance: 'self-implement-pod', outcome: 'refused', data: { spaceId: input.spaceId, reason: 'no-slot' } });
         return { exitCode: null, output: '', error: { code: 'aborted', message: 'aborted before a pool slot opened', ...(lastSlotReasonCode ? { reasonCode: lastSlotReasonCode } : {}) } };
       }
@@ -3005,7 +3039,8 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
         }
         }
         try {
-          appendRunLedgerEntry({ runId: ledgerRunId, event: 'pod-child-run', data: { childRunId: liveChildRunId, job: name, attempt: oomRetried ? 2 : 1, ...(goalFile ? { goalFile } : {}) } }, ledgerDir);
+          appendRunLedgerEntry({ runId: ledgerRunId, timestamp: new Date((options.now ?? Date.now)()).toISOString(),
+            event: 'pod-child-run', data: { childRunId: liveChildRunId, job: name, attempt: oomRetried ? 2 : 1, ...(goalFile ? { goalFile } : {}) } }, ledgerDir);
           appendRunLedgerEntry({ runId: ledgerRunId, event: 'pod-job-applied', data: { job: name, childRunId: liveChildRunId, jobUid: lifecycleJobUid, host: member?.sshHost ?? resolveHostId(env), context, namespace } }, ledgerDir);
           if (lastPlacement) appendRunLedgerEntry({ runId: ledgerRunId, event: 'pod-placement', data: { job: name, childRunId: liveChildRunId, attempt: oomRetried ? 2 : 1, member: lastPlacement.member, kind: lastPlacement.kind, outcome: lastPlacement.outcome, preferred: lastPlacement.preferred, reason: lastPlacement.reason } }, ledgerDir);
           appendRunLedgerEntry({ runId: ledgerRunId, event: 'pod-memory-selected', data: { job: name, childRunId: liveChildRunId, attempt: oomRetried ? 2 : 1, limit: memoryLimit, ...(appliedMemoryRequest ? { request: appliedMemoryRequest } : {}), tier: oomRetried ? retryTier : memoryTier, source: oomRetried ? 'oom-retry' : memorySource, reason: oomRetried ? 'OOMKilled' : memoryReason, declaredGoalType: selectedGoalType } }, ledgerDir);
@@ -3181,8 +3216,8 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
             if (seen !== null) {
               releaseAdmission?.observed?.();
               state = seen === 0 ? 'complete' : 'failed';
-              // The child's own rc (the Pod's terminated state may lag like the condition) — exit-code paths read it as before.
-              if (seen !== 0) containerExitCode = seen;
+              // The child's own rc is the parent's exit code even when 0 — the condition path below yields none here.
+              containerExitCode = seen;
               if (seen !== 0) podTermination = readPodTermination({ kubectl, namespace, job: name, path: 'result-marker', jobUid: lifecycleJobUid });
               if (seen !== 0) captureFailedJob(liveChildRunId);
               debug.log('self-implement.pod', 'result-marker-early', { job: name, waitedMs: Date.now() - waitStartedAt, rc: seen });
@@ -3498,12 +3533,57 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
         // exitCode stays null when the container's code was not read (never filled in as 0).
         const finishedRow = { job: name, run: launchRunId, ...(liveChildRunId !== launchRunId ? { childRun: liveChildRunId } : {}),
           attempt: oomRetried ? 2 : 1, phase: state, exitCode: containerExitCode,
-          reason: failedReason || containerReason || (state === 'complete' ? 'complete' : 'unknown') };
+          reason: failedReason || containerReason || (state === 'complete' ? 'complete' : 'unknown'),
+          // POD-TERMINAL-EVIDENCE-JOIN: keep classifier and termination cause on this Job/childRun/attempt row.
+          failureClassification: disposition?.failureClassification ?? null,
+          classificationBasis: disposition?.childEvidence?.classificationBasis ?? null,
+          // The child-run status is a different axis from the implementation's abandoned classification.
+          // Preserve it even when the child did not emit a parseable self-implement disposition.
+          podExitClass: state === 'failed' ? classifyPodExit({ containerReason: containerReason ?? null,
+            containerExitCode: containerExitCode ?? null, jobReason: failedReason || null, logs }).class : null,
+          childFailureStage: childFailure?.stage ?? null,
+          terminationReason: typeof disposition?.childEvidence?.terminationReason === 'string'
+            ? redactSecretText(disposition.childEvidence.terminationReason).slice(0, 200) : null };
         try { appendRunLedgerEntry({ runId: ledgerRunId, event: POD_LAUNCH_FINISHED_EVENT, timestamp: new Date((options.now ?? Date.now)()).toISOString(), data: finishedRow }, ledgerDir); }
         catch (error) { debug.log('pod.provenance', 'history-unavailable', { job: name, row: 'finished', reason: error instanceof Error ? error.message : String(error) }, { level: 'warn' }); }
         debug.log('pod.provenance', 'job-finished', finishedRow);
-        debug.log('self-implement.pod', 'job-finished', { job: name, ...(member ? { context: member.context } : {}), state, containerReason, stage: disposition?.stage ?? null, prUrl: disposition?.prUrl ?? null, childRunId: liveChildRunId, ledgerCompleteness,
+        // Keep report-deficit incidents queryable as one bounded event. The child detail field is
+        // intentionally capped elsewhere, so cause evidence must not depend on that full payload.
+        const reportDeficit = disposition?.failureClassification === 'report-deficit';
+        const noResultIncident = state === 'failed' && failedReason !== 'DeadlineExceeded' && !disposition;
+        if (reportDeficit || noResultIncident) {
+          const evidence = disposition?.childEvidence;
+          const diagnosticLines = [
+            ...(Array.isArray(evidence?.podLogTail) ? evidence.podLogTail : []),
+            ...(typeof evidence?.detail === 'string' ? evidence.detail.split('\n') : []),
+            ...(typeof evidence?.detailTail === 'string' ? evidence.detailTail.split('\n') : []),
+            ...(typeof evidence?.stderr === 'string' ? evidence.stderr.split('\n') : []),
+            ...(Array.isArray(noResultLogEvidence?.logTail) ? noResultLogEvidence.logTail as string[] : []),
+            ...(Array.isArray(noResultLogEvidence?.podLogTail) ? noResultLogEvidence.podLogTail as string[] : []),
+            ...(typeof noResultLogEvidence?.stderr === 'string' ? noResultLogEvidence.stderr.split('\n') : []),
+          ].slice(-12).map((line) => redactSecretText(line).slice(0, 500));
+          debug.log('pod.child', reportDeficit ? 'report-deficit-cause' : 'terminal-cause', {
+            job: name, run: launchRunId, childRun: liveChildRunId, attempt: oomRetried ? 2 : 1,
+            // A missing parsed result is an incident trigger, not proof of the child's classifier.
+            classification: disposition?.failureClassification ?? null,
+            ...(noResultIncident ? { trigger: 'no-result' } : {}),
+            podExitClass: finishedRow.podExitClass,
+            classificationBasis: evidence?.classificationBasis ?? null,
+            phase: state, exitCode: containerExitCode,
+            reason: failedReason || containerReason || 'unknown',
+            terminationReason: evidence?.terminationReason ?? null,
+            providerErrors: disposition?.providerErrors ?? null,
+            oomKilled, podTermination: podTermination ?? null,
+            detailTail: evidence?.detailTail ?? null,
+            lastLines: diagnosticLines,
+          }, { level: 'warn', compact: { stringMax: 4_500 } });
+        }
+        debug.log('self-implement.pod', 'job-finished', { job: name, ...(member ? { context: member.context } : {}), state, containerReason, stage: disposition?.stage ?? null, prUrl: disposition?.prUrl ?? null, childRunId: liveChildRunId, attempt: oomRetried ? 2 : 1, ledgerCompleteness,
+          ...(noResultLogEvidence ? { stopEvidenceTail: podStopEvidenceTail(noResultLogEvidence) } : {}),
           ...(podTermination ? { podTermination } : {}),
+          failureClassification: finishedRow.failureClassification,
+          classificationBasis: finishedRow.classificationBasis,
+          terminationReason: finishedRow.terminationReason,
           ...(state === 'failed' && !oomKilled && failedReason !== 'DeadlineExceeded'
             ? { ...(childFailure ? { childStage: childFailure.stage } : disposition?.stage ? { childStage: disposition.stage } : {}),
               // POD-NORESULT: a parsed result row without error text is not a missing result line (UX 10-07 01:01: 28 of 28 exit-2 Jobs printed one).
@@ -3569,7 +3649,10 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
             if (!await acquireAdmission()) return admissionFailure();
             member = await acquireSlot();
             if (options.pool && !member) {
-              if (lastSlotAttempt) recordSlotObservation(lastSlotAttempt, 'rejected', lastSlotReasonCode ?? 'aborted');
+              if (lastSlotAttempt) recordSlotObservation(lastSlotAttempt, 'rejected', lastSlotReasonCode ?? 'aborted', {
+                waitReason: stageReason['pool-slot'] ?? null,
+                ...(typeof input.signal?.reason === 'string' ? { abortReason: input.signal.reason } : {}),
+              });
               return { exitCode: null, output: '', error: { code: 'aborted', message: 'aborted before a pool slot opened', ...(lastSlotReasonCode ? { reasonCode: lastSlotReasonCode } : {}) } };
             }
             if (member) context = member.context;
@@ -3595,13 +3678,21 @@ export function podSelfImplementSpawn(options: PodSpawnOptions = {}): SelfImplem
         }
         // The host still has the complete Pod log here. The CLI only retains a short stdout tail,
         // so preserve the parsed child facts in the parent ledger before that tail is returned.
-        if (state === 'failed' || state === 'aborted' || noResultLogEvidence || (state === 'complete' && noResultDiagnostic !== null)) {
+        const childEvidenceRow = podChildEvidenceLedgerRow({
+          job: name,
+          childRunId: liveChildRunId,
+          state,
+          result: disposition ?? null,
+          noResultDiagnostic,
+          noResultLogEvidence,
+          podTermination,
+        });
+        if (childEvidenceRow) {
           // Every terminal attempt writes a marker, including one with no parseable child facts.
           // The next attempt must never inherit an earlier Pod's classification.
-          const childEvidence = noResultLogEvidence
-            ? { ...(disposition?.childEvidence ?? {}), ...noResultLogEvidence }
-            : disposition?.childEvidence ?? null;
-          try { appendRunLedgerEntry({ runId: ledgerRunId, event: 'pod-child-evidence', data: { childEvidence, childRunId: liveChildRunId, job: name, ...(podTermination ? { podTermination } : {}) } }, ledgerDir); }
+          // Also persist completed Jobs whose child result is unsuccessful; Kubernetes
+          // Completed is container success, not proof the requested work converged.
+          try { appendRunLedgerEntry({ runId: ledgerRunId, event: 'pod-child-evidence', data: childEvidenceRow }, ledgerDir); }
           catch (error) { debug.log('self-implement.pod', 'child-evidence-write-failed', { job: name, childRunId: liveChildRunId, reason: error instanceof Error ? error.message : String(error) }, { level: 'warn' }); }
         }
         let prLookup: OpenPrByBranch | undefined;
@@ -3831,6 +3922,15 @@ function boundedPodLogText(source: string, maxChars: number): string {
   return redacted.length > maxChars ? `${redacted.slice(0, maxChars)}…[truncated]` : redacted;
 }
 
+/** A compact, redacted stop clue carried on the attempt-scoped finished row. */
+function podStopEvidenceTail(evidence: Record<string, unknown>): string[] {
+  const raw = Array.isArray(evidence.logTail) ? evidence.logTail
+    : Array.isArray(evidence.podLogTail) ? evidence.podLogTail
+    : typeof evidence.stderr === 'string' ? evidence.stderr.split(/\r\n|\n|\r/u) : [];
+  return raw.slice(-12).filter((line): line is string => typeof line === 'string' && line.length > 0)
+    .map((line) => redactSecretText(line).slice(0, 240));
+}
+
 /** 로그 꼬리 — 마지막 N줄만, 한 줄씩 비밀값 마스킹. */
 export function podNoResultLogTailLines(source: string, maxLines: number = POD_NO_RESULT_LOG_TAIL_LINES): string[] {
   const lines = source.replace(/\r\n/g, '\n').split('\n');

package/src/task-orchestrator/surfaces/self-implement.ts

@@ -123,6 +123,8 @@ export interface PodChildEvidence {
   /** Bounded, redacted diagnostics copied only from a failed child terminal result. */
   error?: string;
   detail?: string;
+  /** Tail of the child detail, retained separately so long reports keep their final diagnostic lines. */
+  detailTail?: string;
   stderr?: string;
   /** Bounded, redacted complete Pod log tail. Separate from child stderr to avoid replacing stronger child facts. */
   podLogTail?: string[];
@@ -130,6 +132,8 @@ export interface PodChildEvidence {
   podLogUnavailable?: string;
   exitCode?: number;
   classification?: string;
+  /** Why the child assigned its failure classification; independent from the label itself. */
+  classificationBasis?: string;
   scopeEscape?: true;
   outOfScopeEdits?: unknown;
   /** SCOPE-ESCAPE-AS-REFINE — why held out-of-scope edits stop the run (deletion · protected path · cap). Present only with scopeEscape. */
@@ -156,6 +160,14 @@ export interface PodChildEvidence {
   goalPlanRevision?: SelfDevJobResult['goalPlanRevision'];
 }
 
+function utf8Tail(value: string, maxBytes: number): string {
+  const bytes = Buffer.from(value, 'utf8');
+  let start = Math.max(0, bytes.length - maxBytes);
+  // Move past continuation bytes so decoding starts at a complete UTF-8 code point.
+  while (start < bytes.length && (bytes[start]! & 0xc0) === 0x80) start++;
+  return bytes.subarray(start).toString('utf8');
+}
+
 const SCOPE_STOP_REASON_ORDER: readonly ScopeStopReason[] = SCOPE_STOP_REASONS;
 
 /** Stop reasons for held out-of-scope edits: the child's own `scopeStopReasons` (orchestrator decideScopeExpansion) plus
@@ -218,12 +230,18 @@ export function podChildEvidenceFromResult(o: Record<string, unknown>): PodChild
   const classification = scopeEscape ? 'scope-escape'
     : typeof abandoned?.classification === 'string' ? redactSecretText(abandoned.classification)
       : typeof o.failureClassification === 'string' ? redactSecretText(o.failureClassification) : undefined;
+  const rawClassificationBasis = abandoned?.classificationBasis ?? o.classificationBasis;
+  const classificationBasis = typeof rawClassificationBasis === 'string' && rawClassificationBasis.trim()
+    ? redactSecretText(rawClassificationBasis).slice(0, 200) : undefined;
   const evidence: PodChildEvidence = {
     ...(failedText(o.error) ? { error: failedText(o.error) } : {}),
     ...(failedText(o.detail) ? { detail: failedText(o.detail) } : {}),
+    ...(o.ok === false && typeof o.detail === 'string' && o.detail.trim()
+      ? { detailTail: utf8Tail(redactSecretText(o.detail), 4_096) } : {}),
     ...(failedText(o.stderr) ? { stderr: failedText(o.stderr) } : {}),
     ...(failureExitCode !== undefined ? { exitCode: failureExitCode } : {}),
     ...(classification ? { classification } : {}),
+    ...(classificationBasis ? { classificationBasis } : {}),
     ...(scopeEscape ? { scopeEscape: true, scopeStopReasons } : {}),
     ...(outOfScopeEdits !== undefined ? { outOfScopeEdits } : {}),
     ...(newScope ? { newScope } : {}),

package/src/tui/entry.ts

@@ -346,9 +346,11 @@ export async function showNextTui(options: NextTuiOptions = {}): Promise<void> {
     const sidetabLines = sidetabOpen
       ? sidetabApi!.formatSidetabLines(sidetabRows, sidetabSelected, sidetabWidth, Math.max(1, rows - 1), sidetabMode)
       : [];
-    const screenLines = sidetabOpen
-      ? lines.map((line, index) => `${sidetabLines[index] ?? ' '.repeat(sidetabWidth)}│${line}`)
-      : lines;
+    const screenLineCount = sidetabOpen ? Math.max(lines.length, sidetabLines.length) : lines.length;
+    const screenLines = Array.from({ length: screenLineCount }, (_, index) => {
+      const line = lines[index] ?? '';
+      return sidetabOpen ? `${sidetabLines[index] ?? ' '.repeat(sidetabWidth)}│${line}` : line;
+    });
     process.stdout.write(`\x1b[H\x1b[2J${screenLines.join('\n')}\x1b[${promptRow};${prompt.cursorCol + (sidetabOpen ? sidetabWidth + 1 : 0)}H\x1b[?25h`);
     if (sidetabAttachments?.hasModal() && !paintingCoordinatorFrame) sidetabAttachments.refresh();
   };
@@ -1258,10 +1260,15 @@ export async function showNextTui(options: NextTuiOptions = {}): Promise<void> {
         }
         if (submitted === '/help' || submitted === '/help next') {
           activity.push(
+            'Commands',
             'Next TUI: /side · /sidetab — 세션/PTY 목록',
             '사이드탭: Ctrl+\\ 토글 · ↑↓ 선택 · 빈 prompt Enter=attach · /side new · /side kill',
             '새 PTY: s shell · e elanous · c codex 구독 · l claude code 구독',
             'PTY 분리: Ctrl+\\ 후 d · /term help 는 읽기 전용 목록 명령',
+            '',
+            'Keys',
+            'Enter 전송 · Esc 취소 · PgUp/PgDn 대화 스크롤 · Ctrl+Q 종료',
+            'Ctrl+\\ 사이드탭 토글 · ↑/↓ 목록 이동 · Esc 입력으로 돌아오기',
           );
           status = 'Enter 전송';
           render();

package/src/tui/sidetab/list.ts

@@ -1,2 +1,47 @@
 /** Compatibility entry point for existing Next TUI callers. Shared behavior lives in sidetab-core. */
 export * from '../../sidetab-core/model.js';
+import {
+  formatSidetabLines as formatCoreSidetabLines,
+  loadSidetabRows as loadCoreSidetabRows,
+  type SidetabRow,
+} from '../../sidetab-core/model.js';
+import { listPtyManifestRows } from '../../pty-shell/pty-manifest.js';
+import { formatSidetabPeekLines } from './peek.js';
+
+type PreviewSidetabRow = SidetabRow & { readonly previewSource?: string };
+
+/** Attach the latest manifest snapshot without changing the shared row contract. */
+export function loadSidetabRows(all = false, currentSessionId?: string): SidetabRow[] {
+  const snapshots = new Map<string, string>(listPtyManifestRows().map((row) => [row.id, row.snapshot || row.frame] as const));
+  return loadCoreSidetabRows(all, currentSessionId).map((row) => ({
+    ...row,
+    previewSource: snapshots.get(row.id) ?? '',
+  }));
+}
+
+/** Render the core list and reserve a bounded tail preview for the selected PTY row. */
+export function formatSidetabLines(
+  rows: readonly SidetabRow[],
+  selected: number,
+  width: number,
+  height = Number.POSITIVE_INFINITY,
+  mode: 'list' | 'new' = 'list',
+): string[] {
+  const selectedRow = rows[selected] as PreviewSidetabRow | undefined;
+  const peekLines = mode === 'list' && selectedRow
+    ? formatSidetabPeekLines(selectedRow.previewSource ?? '', width)
+    : [];
+  if (peekLines.length === 0) return formatCoreSidetabLines(rows, selected, width, height, mode);
+
+  const reservedRows = peekLines.length + 1;
+  const coreLines = formatCoreSidetabLines(rows, selected, width, Math.max(0, height - reservedRows), mode);
+  // The core formatter reserves the leading ` › ` token for selection; a
+  // session label may itself contain `›`, so searching anywhere in the line
+  // can place the preview under the wrong row.
+  const selectedLine = coreLines.findIndex((line) => line.startsWith(' › '));
+  if (selectedLine < 0) return coreLines;
+
+  const lines = [...coreLines];
+  lines.splice(selectedLine + 1, 0, ' '.repeat(width), ...peekLines);
+  return Number.isFinite(height) ? lines.slice(0, Math.max(0, Math.floor(height))) : lines;
+}

package/src/tui/sidetab/nl-tool.ts

@@ -1,136 +1,2 @@
-import type { LLMToolSpec } from '../../llm.js';
-import type { SidetabRow } from './list.js';
-
-export const NEXT_SIDETAB_TOOL_NAME = 'NextSidetab';
-const CALL = 'elanous.sidetab.call';
-const RESULT = 'elanous.sidetab.result';
-
-export type NextSidetabAction = 'list' | 'switch' | 'attach' | 'detach' | 'new' | 'kill';
-export interface NextSidetabRequest {
-  action: NextSidetabAction;
-  target?: string;
-  character?: 'shell' | 'elanous';
-  confirm?: boolean;
-}
-export interface NextSidetabCall { type: typeof CALL; callId: string; request: NextSidetabRequest }
-export interface NextSidetabResult { type: typeof RESULT; callId: string; result: unknown }
-export type NextSidetabHandler = (request: NextSidetabRequest) => Promise<unknown>;
-export interface NextSidetabHostDeps {
-  rows(): readonly SidetabRow[] | Promise<readonly SidetabRow[]>;
-  selected(): number;
-  switchSession(row: SidetabRow): Promise<unknown>;
-  attach(row: SidetabRow): Promise<unknown>;
-  detach(): unknown;
-  spawn(character: 'shell' | 'elanous'): unknown;
-  kill(row: SidetabRow): unknown;
-}
-export interface NextSidetabIpcProcess {
-  send?: (message: unknown) => boolean | void;
-  on(event: 'message', listener: (message: unknown) => void): unknown;
-}
-
-export const nextSidetabToolSpec: LLMToolSpec = {
-  name: NEXT_SIDETAB_TOOL_NAME,
-  description: 'Control the Next TUI side tab: list/view sessions and PTYs, switch sessions, attach or detach, start a local shell or elanous PTY, or kill a PTY. Ask the user to confirm before calling kill with confirm=true. Starting coding agents is not supported.',
-  parameters: {
-    type: 'object',
-    properties: {
-      action: { type: 'string', enum: ['list', 'switch', 'attach', 'detach', 'new', 'kill'] },
-      target: { type: 'string', description: 'Optional exact or partial row id/label; required for targeted actions.' },
-      character: { type: 'string', enum: ['shell', 'elanous'], description: 'Only used with action=new.' },
-      confirm: { type: 'boolean', description: 'Must be true only after the user explicitly confirmed killing the selected PTY.' },
-    },
-    required: ['action'],
-    additionalProperties: false,
-  },
-};
-
-export function isNextSidetabCall(value: unknown): value is NextSidetabCall {
-  const call = value as Partial<NextSidetabCall> | null;
-  return Boolean(call && call.type === CALL && typeof call.callId === 'string'
-    && call.request && typeof call.request === 'object');
-}
-
-export async function answerNextSidetabCall(handler: NextSidetabHandler, call: NextSidetabCall): Promise<NextSidetabResult> {
-  try { return { type: RESULT, callId: call.callId, result: await handler(call.request) }; }
-  catch (error) {
-    return { type: RESULT, callId: call.callId, result: { error: error instanceof Error ? error.message : String(error) } };
-  }
-}
-
-export function createNextSidetabHostHandler(deps: NextSidetabHostDeps): NextSidetabHandler {
-  return async (request) => {
-    if (!request || !['list', 'switch', 'attach', 'detach', 'new', 'kill'].includes(request.action)) {
-      return { error: '지원하지 않는 사이드탭 동작입니다' };
-    }
-    if (request.action === 'new') {
-      if (request.character !== 'shell' && request.character !== 'elanous') return { error: 'character는 shell 또는 elanous여야 합니다' };
-      return deps.spawn(request.character);
-    }
-    if (request.action === 'detach') return deps.detach();
-    const rows = await deps.rows();
-    if (request.action === 'list') return rows.map(({ id, label, kind, badge, sessionId }) => ({ id, label, kind, badge, ...(sessionId ? { sessionId } : {}) }));
-    const target = request.target?.trim();
-    const exact = target ? rows.find((item) => item.id === target)
-      ?? rows.find((item) => item.label.toLowerCase() === target.toLowerCase()) : undefined;
-    const partial = target && !exact ? rows.filter((item) => item.label.toLowerCase().includes(target.toLowerCase())) : [];
-    if (partial.length > 1) return { error: `사이드탭 항목이 여러 개 일치합니다: ${target}` };
-    const row = exact ?? partial[0] ?? (target ? undefined : rows[deps.selected()]);
-    if (!row) return { error: target ? `사이드탭 항목을 찾지 못했습니다: ${target}` : '선택된 사이드탭 항목이 없습니다' };
-    if (request.action === 'switch') return row.kind === 'tui' ? deps.switchSession(row) : { error: 'Next TUI 세션만 전환할 수 있습니다' };
-    if (request.action === 'attach') return deps.attach(row);
-    if (row.currentProcess) return { error: '현재 TUI 세션은 사이드탭에서 종료할 수 없습니다' };
-    if (request.confirm !== true) return { needsConfirmation: true, message: `PTY 종료 확인 필요: ${row.label}` };
-    return deps.kill(row);
-  };
-}
-
-export function createReplNextSidetabTool(
-  proc: NextSidetabIpcProcess,
-  env: NodeJS.ProcessEnv = process.env,
-  timeoutMs = 15_000,
-): { spec: LLMToolSpec; dispatch: (args: Record<string, unknown>) => Promise<unknown> } | null {
-  if (env.ELANOUS_NEXT_TUI_SIDETAB_IPC !== '1' || typeof proc.send !== 'function') return null;
-  const send = proc.send.bind(proc);
-  const waiting = new Map<string, (result: unknown) => void>();
-  let sequence = 0;
-  const listener = (message: unknown): void => {
-    const result = message as Partial<NextSidetabResult> | null;
-    if (!result || result.type !== RESULT || typeof result.callId !== 'string') return;
-    const resolve = waiting.get(result.callId);
-    if (!resolve) return;
-    waiting.delete(result.callId);
-    resolve(result.result);
-  };
-  proc.on('message', listener);
-  return {
-    spec: nextSidetabToolSpec,
-    dispatch: (args) => new Promise((resolve) => {
-      const callId = `s${++sequence}`;
-      const timer = setTimeout(() => {
-        if (!waiting.delete(callId)) return;
-        resolve({ error: 'Next TUI did not answer the side-tab request' });
-      }, timeoutMs);
-      waiting.set(callId, (result) => { clearTimeout(timer); resolve(result); });
-      try {
-        send({ type: CALL, callId, request: args as unknown as NextSidetabRequest } satisfies NextSidetabCall);
-      } catch (error) {
-        waiting.delete(callId);
-        clearTimeout(timer);
-        resolve({ error: `Next TUI IPC send failed: ${error instanceof Error ? error.message : String(error)}` });
-      }
-    }),
-  };
-}
-
-export function registerNextSidetabReplTool(
-  specs: LLMToolSpec[],
-  dispatchByName: Map<string, (args: Record<string, unknown>) => Promise<unknown>>,
-  proc: NextSidetabIpcProcess,
-  env: NodeJS.ProcessEnv = process.env,
-): void {
-  const tool = createReplNextSidetabTool(proc, env);
-  if (!tool) return;
-  specs.push(tool.spec);
-  dispatchByName.set(tool.spec.name, tool.dispatch);
-}
+/** Compatibility entry point for Next TUI callers. Shared contracts and policy live in sidetab-core. */
+export * from '../../sidetab-core/model.js';

package/src/tui/sidetab/peek.ts

@@ -0,0 +1,52 @@
+const graphemes = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+
+const ANSI_CONTROL = /\x1b(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1b\\)|[PX^_].*?\x1b\\|.)/gs;
+const NON_TEXT_CONTROL = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g;
+const MAX_PEEK_SOURCE_CHARS = 16_384;
+
+function fitLine(value: string, width: number): string {
+  if (width <= 0) return '';
+  if (Bun.stringWidth(value) <= width) return value;
+  const maxTextWidth = Math.max(0, width - 1);
+  let result = '';
+  let used = 0;
+  for (const { segment } of graphemes.segment(value)) {
+    const cells = Bun.stringWidth(segment);
+    if (used + cells > maxTextWidth) break;
+    result += segment;
+    used += cells;
+  }
+  return `${result}…`;
+}
+
+/** Return up to three recent plain-text output lines for the selected sidebar row. */
+export function formatSidetabPeekLines(
+  source: string,
+  width: number,
+  maxLines = 3,
+): string[] {
+  if (!source || width < 5 || maxLines <= 0) return [];
+
+  let start = Math.max(0, source.length - MAX_PEEK_SOURCE_CHARS);
+  // Keep a surrogate pair intact when the bounded tail starts in its second code unit.
+  const firstCodeUnit = source.charCodeAt(start);
+  if (start > 0 && firstCodeUnit >= 0xdc00 && firstCodeUnit <= 0xdfff) start++;
+  let bounded = source.slice(start);
+  // The cut may land in an ANSI sequence or line. Drop that partial prefix; recent complete lines follow it.
+  if (start > 0) {
+    const firstLineBreak = bounded.search(/[\r\n]/);
+    if (firstLineBreak >= 0) bounded = bounded.slice(firstLineBreak + 1);
+  }
+
+  const clean = bounded
+    .replace(ANSI_CONTROL, '')
+    .replace(NON_TEXT_CONTROL, '')
+    .replace(/\r\n?/g, '\n');
+  const recent = clean.split('\n')
+    .map((line) => line.trimEnd())
+    .filter((line) => line.trim().length > 0)
+    .slice(-Math.min(3, Math.floor(maxLines)));
+  const prefix = '   ↳ ';
+  const textWidth = Math.max(1, width - Bun.stringWidth(prefix));
+  return recent.map((line) => `${prefix}${fitLine(line, textWidth)}`);
+}

package/src/tui-client/dashboard-session.ts

@@ -211,6 +211,9 @@ export class DashboardSession {
         ? { resolveMaxToolTurns: opts.resolveMaxToolTurns }
         : {}),
       ...(opts.abortPollMs !== undefined ? { abortPollMs: opts.abortPollMs } : {}),
+      // TUI-TOKEN-GUARD-WIRE — the host history write-back for the request-size cap.
+      ...(opts.compactPersistedHistory ? { compactPersistedHistory: opts.compactPersistedHistory } : {}),
+      ...(opts.requestSizeMaxChars !== undefined ? { requestSizeMaxChars: opts.requestSizeMaxChars } : {}),
     });
 
     const serverPromise = runAcpServer({