elanous 0.2.4 → 0.2.5

package/src/task-orchestrator/surfaces/pod-command-job.ts

@@ -6,12 +6,14 @@
 // 명령 인자는 셸 문자열로 이어붙이지 않고 `"$@"` 로 따로 인용한다.
 
 import { spawnSync } from 'node:child_process';
+import { isAbsolute } from 'node:path';
+import { getUserConfig } from '../../user-config.js';
 import { debug } from '../../debug/log.js';
 import { effectiveInstanceRoot } from '../../instance/resolve.js';
 import { collectPodArtifacts } from './pod-artifact-return.js';
 import { type PodPoolMember, PodPoolScheduler, resolvePodPoolSpec, parsePodPool, checkPodPool, syncPoolImages, type PoolKubectl } from './pod-pool.js';
 import { readSkillEnvFiles } from './pod-skills.js';
-import { podSourceScript } from './pod-source-receive.js';
+import { podSourceScript, type PodSource } from './pod-source-receive.js';
 import {
   POD_CHILD_REQUESTS,
   POD_JOB_DEADLINE_SECONDS,
@@ -73,6 +75,10 @@ export interface PodCommandJobInput {
   llm?: 'grok';
   /** 저장소를 clone 한다 — 비공개 저장소라 GitHub 토큰이 Secret 으로 간다(명시 opt-in). 기본은 clone 없이 `~/work` 에서 이미지의 `elanous` 로 돈다. */
   clone?: boolean;
+  hostMirror?: string;
+  /** 컨테이너 메모리 한도(기본 16Gi) — 게이트가 파일 하나 격리 Job 에 올린다. */
+  memoryLimit?: string;
+  source?: PodSource;
   deadlineSeconds: number;
   runId?: string;
 }
@@ -100,7 +106,7 @@ export function podCommandJobManifest(o: PodCommandJobInput): Record<string, unk
     ...credLines,
     'curl -s -m 3 -o /dev/null http://host.orb.internal:31415/health && { echo "[pod] ISOLATION FAIL"; exit 3; }',
     ...(o.clone
-      ? ['export GH_TOKEN="$(cat /creds/gh-token)" && gh auth setup-git', podSourceScript({ kind: 'default' }, o.repoUrl)]
+      ? ['export GH_TOKEN="$(cat /creds/gh-token)" && gh auth setup-git', podSourceScript(o.source ?? { kind: 'default' }, o.repoUrl)]
       : ['mkdir -p ~/work && cd ~/work']),
     `set -- ${quotedArgs}`,
     '"$@"',
@@ -125,16 +131,22 @@ export function podCommandJobManifest(o: PodCommandJobInput): Record<string, unk
           initContainers: [{ name: 'isolation-gate', image: o.image, imagePullPolicy: o.imagePullPolicy ?? 'Never', command: ['bash', '-c'], args: [GATE] }],
           containers: [{
             name: 'child', image: o.image, imagePullPolicy: o.imagePullPolicy ?? 'Never',
-            resources: { requests: { ...POD_CHILD_REQUESTS }, limits: { memory: '16Gi', cpu: '4' } },
+            resources: { requests: { ...POD_CHILD_REQUESTS }, limits: { memory: o.memoryLimit ?? '16Gi', cpu: '4' } },
             command: ['bash', '-c'], args: [script],
             env: [
               ...(o.runId ? [{ name: 'ELANOUS_RUN_ID', value: o.runId }] : []),
               { name: 'ELANOUS_SUBSTRATE', value: 'pod' },
               { name: 'ELANOUS_POD_NAME', valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } },
             ],
-            ...(secretKeys ? { volumeMounts: [{ name: 'creds', mountPath: '/creds', readOnly: true }] } : {}),
+            ...(secretKeys || o.hostMirror ? { volumeMounts: [
+              ...(secretKeys ? [{ name: 'creds', mountPath: '/creds', readOnly: true }] : []),
+              ...(o.hostMirror ? [{ name: 'host-mirror', mountPath: '/host-mirror', readOnly: true }] : []),
+            ] } : {}),
           }],
-          ...(secretKeys ? { volumes: [{ name: 'creds', secret: { secretName: `${o.name}-creds`, defaultMode: 0o400 } }] } : {}),
+          ...(secretKeys || o.hostMirror ? { volumes: [
+            ...(secretKeys ? [{ name: 'creds', secret: { secretName: `${o.name}-creds`, defaultMode: 0o400 } }] : []),
+            ...(o.hostMirror ? [{ name: 'host-mirror', hostPath: { path: o.hostMirror, type: 'Directory' } }] : []),
+          ] } : {}),
         },
       },
     },
@@ -188,6 +200,10 @@ export interface RunPodCommandOptions {
   skills?: readonly string[];
   llm?: 'grok';
   clone?: boolean;
+  hostMirror?: string;
+  /** 컨테이너 메모리 한도(기본 16Gi). */
+  memoryLimit?: string;
+  source?: PodSource;
   ghToken?: () => string;
   deadlineSeconds?: number;
   namespace?: string;
@@ -207,6 +223,7 @@ export interface RunPodCommandOptions {
   sleep?: (ms: number) => Promise<void>;
   log?: (category: string, event: string, data: Record<string, unknown>) => void;
   env?: NodeJS.ProcessEnv;
+  configHostMirror?: () => string | undefined;
 }
 
 function jobFinished(types: string): 'complete' | 'failed' | null {
@@ -243,6 +260,9 @@ export async function runPodCommand(options: RunPodCommandOptions): Promise<PodC
   const deadlineSeconds = options.deadlineSeconds ?? POD_COMMAND_DEADLINE_SECONDS;
   const name = options.name ?? podJobName(`cmd-${Date.now().toString(36)}`);
   const env = options.env ?? process.env;
+  const hostMirror = (options.hostMirror ?? env.ELANOUS_POD_HOST_MIRROR
+    ?? (options.configHostMirror ?? (() => getUserConfig().pod?.hostMirror))())?.trim() || undefined;
+  if (hostMirror && !isAbsolute(hostMirror)) throw new Error('pod.hostMirror must be an absolute directory path');
 
   let member: PodPoolMember | null = null;
   let pool = options.poolScheduler;
@@ -307,7 +327,8 @@ export async function runPodCommand(options: RunPodCommandOptions): Promise<PodC
     const manifest = podCommandJobManifest({
       name, namespace, image: member?.imageRef ?? image,
       ...(member?.imageRef ? { imagePullPolicy: 'IfNotPresent' as const } : {}),
-      repoUrl, command, skills, ...(llm ? { llm } : {}), ...(options.clone ? { clone: true } : {}), deadlineSeconds,
+      repoUrl, command, skills, ...(llm ? { llm } : {}), ...(options.clone ? { clone: true } : {}),
+      ...(options.source ? { source: options.source } : {}), ...(hostMirror ? { hostMirror } : {}), ...(options.memoryLimit ? { memoryLimit: options.memoryLimit } : {}), deadlineSeconds,
       ...(options.runId ? { runId: options.runId } : {}),
     });
     kubectl(['-n', namespace, 'delete', 'job', name, '--ignore-not-found']);

package/src/task-orchestrator/surfaces/pod-ledger-collect.ts

@@ -125,13 +125,18 @@ export function createPodLedgerFollower(opts: {
   let disabled = false;
   let lastProgressAt = now();
   let lastProgressEvent: string | null = null;
+  let lastActivityMeasuredAt = lastProgressAt;
+  let lastActivityLogAt = -Infinity;
   let nextStallMinute = stallMinutes;
   let stalled = false;
-  function checkStall() {
+  function checkStall(ledgerRead: boolean, activityMeasured: boolean) {
     const idleMinutes = Math.max(0, (now() - lastProgressAt) / 60_000);
     if (idleMinutes >= nextStallMinute) {
       log('self-implement.pod', 'stalled', { runId: opts.runId, lastProgressEvent, idleMinutes });
-      onStall(`[pod] 진행 없음 ${Math.floor(idleMinutes)}분 — 마지막 진행 ${lastProgressEvent ?? '없음'}`);
+      const observation = ledgerRead
+        ? (activityMeasured ? '원장·작업 트리 모두 조용함' : '원장 조용함')
+        : '원장 못 잼';
+      onStall(`[pod] 진행 없음 ${Math.floor(idleMinutes)}분 — ${observation} · 마지막 진행 ${lastProgressEvent ?? '없음'}${activityMeasured ? '' : ' (작업 트리 못 잼)'}`);
       stalled = true;
       nextStallMinute = (Math.floor(idleMinutes / stallMinutes) + 1) * stallMinutes;
     }
@@ -145,13 +150,38 @@ export function createPodLedgerFollower(opts: {
         log('self-implement.pod', 'ledger-live-skipped', { runId: opts.runId, reason: 'host-ledger-exists' });
         return;
       }
-      const r = opts.exec(`f="\${ELANOUS_STATE_DIR:-$HOME/.elanous}/run-ledger/${opts.runId}.jsonl"; [ -f "$f" ] || exit 0; tail -c +${offset + 1} "$f"`);
-      if (r.status !== 0) { log('self-implement.pod', 'ledger-live-unavailable', { runId: opts.runId, status: r.status, stderr: r.stderr.trim().slice(0, 200) }); checkStall(); return; }
-      if (!r.stdout) { checkStall(); return; }
-      offset += Buffer.byteLength(r.stdout);
-      const text = pending + r.stdout;
+      const since = `${Math.floor(lastActivityMeasuredAt / 1000)}.${String(lastActivityMeasuredAt % 1000).padStart(3, '0')}`;
+      const measurementStartedAt = now();
+      const until = `${Math.floor(measurementStartedAt / 1000)}.${String(measurementStartedAt % 1000).padStart(3, '0')}`;
+      const r = opts.exec(`s="\${ELANOUS_STATE_DIR:-$HOME/.elanous}"; f="$s/run-ledger/${opts.runId}.jsonl"; w="$s/worktrees"; if [ -f "$f" ]; then tail -c +${offset + 1} "$f" || exit 1; fi; target=''; matches=0; for tree in "$w"/*/*.worktrees/*; do [ -e "$tree/.git" ] || continue; owner=$(git -C "$tree" config --worktree --get elanous.harness.owner 2>/dev/null) || continue; [ "$owner" = 'dev:${opts.runId}' ] || continue; target="$tree"; matches=$((matches + 1)); done; if [ "$matches" -eq 1 ]; then activity=$(find "$target" -type d \\( -name .git -o -name node_modules \\) -prune -o -type f -newermt '@${since}' ! -newermt '@${until}' -printf . 2>/dev/null) && printf '\\nELANOUS_ACTIVITY %s\\n' "\${#activity}" || printf '\\nELANOUS_ACTIVITY_ERROR\\n'; else printf '\\nELANOUS_ACTIVITY_ERROR\\n'; fi`);
+      if (r.status !== 0) { log('self-implement.pod', 'ledger-live-unavailable', { runId: opts.runId, status: r.status, stderr: r.stderr.trim().slice(0, 200) }); checkStall(false, false); return; }
+      const marker = r.stdout.lastIndexOf('\nELANOUS_ACTIVITY');
+      const activityLine = marker < 0 ? '' : r.stdout.slice(marker + 1);
+      const activityMatch = /^ELANOUS_ACTIVITY (0|[1-9]\d*)\n$/.exec(activityLine);
+      const activityMeasured = !!activityMatch && Number.isSafeInteger(Number(activityMatch[1]));
+      // A missing measurement trailer is still a usable ledger response unless it contains activity protocol bytes.
+      const ledgerBytes = marker < 0 ? (r.stdout.includes('ELANOUS_ACTIVITY') ? '' : r.stdout) : r.stdout.slice(0, marker);
+      if (activityMeasured) {
+        lastActivityMeasuredAt = measurementStartedAt;
+        const files = Number(activityMatch![1]);
+        if (files > 0) {
+          const idleMinutes = Math.max(0, (now() - lastProgressAt) / 60_000);
+          if (stalled) log('self-implement.pod', 'stall-cleared', { runId: opts.runId, idleMinutes });
+          stalled = false;
+          lastProgressAt = now();
+          lastProgressEvent = 'worktree-activity';
+          nextStallMinute = stallMinutes;
+          if (now() - lastActivityLogAt >= 5 * 60_000) {
+            log('self-implement.pod', 'worktree-activity', { runId: opts.runId, files });
+            lastActivityLogAt = now();
+          }
+        }
+      }
+      if (!ledgerBytes) { checkStall(true, activityMeasured); return; }
+      offset += Buffer.byteLength(ledgerBytes);
+      const text = pending + ledgerBytes;
       const cut = text.lastIndexOf('\n');
-      if (cut < 0) { pending = text; checkStall(); return; }
+      if (cut < 0) { pending = text; checkStall(true, activityMeasured); return; }
       const complete = text.slice(0, cut + 1);
       pending = text.slice(cut + 1);
       mkdirSync(dir, { recursive: true });
@@ -171,7 +201,7 @@ export function createPodLedgerFollower(opts: {
         lastProgressEvent = event;
         nextStallMinute = stallMinutes;
       }
-      checkStall();
+      checkStall(true, activityMeasured);
     },
   };
 }

package/src/task-orchestrator/surfaces/pod-source-bundle.ts

@@ -13,6 +13,7 @@ type PackOptions = {
   paths?: string[];
   outDir: string;
   maxSizeBytes?: number;
+  mirrorHead?: string;
   log?: (category: string, event: string, data: Record<string, unknown>) => void;
 };
 
@@ -108,7 +109,21 @@ export function packSourceBundle(options: PackOptions): PackedBundle {
     ref = `refs/elanous/pod-source/${randomUUID()}`;
     git(root, env, 'update-ref', ref, headCommit);
     createdBundle = true;
-    git(root, env, 'bundle', 'create', bundlePath, `${baseCommit}..${ref}`);
+    let bundleRevision = ref;
+    if (options.mirrorHead !== undefined) {
+      // A thin bundle is usable only when its excluded history belongs to the packed base's lineage.
+      const mirrorHead = options.mirrorHead;
+      let sharedHistory = false;
+      if (/^[0-9a-f]{40,64}$/.test(mirrorHead)) {
+        try {
+          git(root, env, 'cat-file', '-e', `${mirrorHead}^{commit}`);
+          git(root, env, 'merge-base', '--is-ancestor', mirrorHead, baseCommit);
+          sharedHistory = true;
+        } catch { /* The mirror is unavailable or unrelated; include all history instead. */ }
+      }
+      bundleRevision = sharedHistory ? `${mirrorHead}..${ref}` : ref;
+    }
+    git(root, env, 'bundle', 'create', bundlePath, bundleRevision);
     git(root, env, 'update-ref', '-d', ref, headCommit);
     ref = undefined;
     const sizeBytes = statSync(bundlePath).size;

package/src/task-orchestrator/surfaces/pod-source-receive.ts

@@ -30,11 +30,33 @@ function assertSize(value: number): number {
 }
 
 /** Job 스크립트의 원천 단계. 성공 갈래는 `ELANOUS_POD_SOURCE <kind> <HEAD>` 로 끝난다. */
-export function podSourceScript(source: PodSource, repoUrl: string): string {
-  const clone = `git clone -q --depth 50 '${repoUrl}' repo`;
+export function podSourceScript(source: PodSource, repoUrl: string, mirrorPath = '/host-mirror'): string {
+  const quotedUrl = `'${repoUrl.replace(/'/g, `'\\''`)}'`;
+  const quotedMirror = `'${mirrorPath.replace(/'/g, `'\\''`)}'`;
+  const clone = `git clone -q --depth 50 ${quotedUrl} repo`;
+  const start = [
+    'if [ -e repo ]; then exit 5; fi',
+    `if [ -d ${quotedMirror} ] && git -C ${quotedMirror} rev-parse --verify HEAD >/dev/null 2>&1 && git clone -q --shared -- ${quotedMirror} repo && git -C repo rev-parse --verify HEAD >/dev/null 2>&1; then`,
+    `  git -C repo remote set-url origin ${quotedUrl} || exit 5`,
+    '  source_via=mirror',
+    'else',
+    '  if [ -e repo ]; then rm -r -- repo || exit 5; fi',
+    `  ${clone} || exit 5`,
+    '  source_via=github',
+    'fi',
+    "printf 'ELANOUS_POD_SOURCE_VIA %s\\n' \"$source_via\"",
+    'cd repo || exit 5',
+  ];
   if (source.kind === 'default') {
     return [
-      `${clone} && cd repo || exit 5`,
+      ...start,
+      'if [ "$source_via" = mirror ]; then',
+      '  remote_head=$(git ls-remote origin HEAD | cut -f1) || exit 5',
+      '  if ! [[ "$remote_head" =~ ^[0-9a-f]{40}$ ]]; then exit 5; fi',
+      '  if [ "$remote_head" != "$(git rev-parse HEAD)" ]; then',
+      '    git fetch --depth 50 origin HEAD && git reset --hard FETCH_HEAD || exit 5',
+      '  fi',
+      'fi',
       'head=$(git rev-parse HEAD)',
       "printf 'ELANOUS_POD_SOURCE default %s\\n' \"$head\"",
     ].join('\n');
@@ -42,9 +64,9 @@ export function podSourceScript(source: PodSource, repoUrl: string): string {
   if (source.kind === 'commit') {
     const sha = assertSha(source.sha, 'sha');
     return [
-      `${clone} && cd repo || exit 5`,
-      `git fetch --depth 1 origin ${sha}`,
-      `git checkout --detach ${sha}`,
+      ...start,
+      `if ! git cat-file -e '${sha}^{commit}' 2>/dev/null; then git fetch --depth 1 origin ${sha} || exit 5; fi`,
+      `git checkout --detach ${sha} || exit 5`,
       'head=$(git rev-parse HEAD)',
       "printf 'ELANOUS_POD_SOURCE commit %s\\n' \"$head\"",
     ].join('\n');
@@ -52,9 +74,11 @@ export function podSourceScript(source: PodSource, repoUrl: string): string {
   if (source.kind === 'pr') {
     const n = assertPositiveInt(source.number);
     return [
-      `${clone} && cd repo || exit 5`,
-      `git fetch --depth 50 origin pull/${n}/head:pr-${n}`,
-      `git checkout pr-${n}`,
+      ...start,
+      `pr_sha=$(git ls-remote origin refs/pull/${n}/head | cut -f1) || exit 5`,
+      'if ! [[ "$pr_sha" =~ ^[0-9a-f]{40}$ ]]; then exit 5; fi',
+      `if ! git cat-file -e "$pr_sha^{commit}" 2>/dev/null; then git fetch --depth 50 origin pull/${n}/head || exit 5; fi`,
+      `git checkout -B pr-${n} "$pr_sha" || exit 5`,
       'head=$(git rev-parse HEAD)',
       "printf 'ELANOUS_POD_SOURCE pr %s\\n' \"$head\"",
     ].join('\n');
@@ -82,10 +106,24 @@ export function podSourceScript(source: PodSource, repoUrl: string): string {
     "  printf 'ELANOUS_POD_SOURCE_MISMATCH sha256\\n'",
     '  exit 3',
     'fi',
-    'git clone /tmp/source.bundle repo',
-    `git -C repo checkout --detach ${headCommit}`,
-    'head=$(git -C repo rev-parse HEAD)',
+    'if [ -e repo ]; then exit 5; fi',
+    `if [ -d ${quotedMirror} ] && git -C ${quotedMirror} rev-parse --verify HEAD >/dev/null 2>&1 && git clone -q --shared -- ${quotedMirror} repo && git -C repo rev-parse --verify HEAD >/dev/null 2>&1; then`,
+    `  git -C repo remote set-url origin ${quotedUrl} || exit 5`,
+    '  if git -C repo bundle verify /tmp/source.bundle >/dev/null 2>&1; then',
+    '    git -C repo fetch /tmp/source.bundle "refs/elanous/pod-source/*:refs/remotes/bundle/*" || exit 5',
+    '  else',
+    '    rm -r -- repo || exit 5',
+    '    git clone /tmp/source.bundle repo || exit 5',
+    '    git -C repo fetch /tmp/source.bundle "refs/elanous/pod-source/*:refs/remotes/bundle/*" || exit 5',
+    '  fi',
+    'else',
+    '  if [ -e repo ]; then rm -r -- repo || exit 5; fi',
+    '  git clone /tmp/source.bundle repo || exit 5',
+    '  git -C repo fetch /tmp/source.bundle "refs/elanous/pod-source/*:refs/remotes/bundle/*" || exit 5',
+    'fi',
+    `git -C repo checkout --detach ${headCommit} || exit 5`,
+    'head=$(git -C repo rev-parse HEAD) || exit 5',
     "printf 'ELANOUS_POD_SOURCE bundle %s\\n' \"$head\"",
-    'cd repo',
+    'cd repo || exit 5',
   ].join('\n');
 }