ework-daemon 0.4.45 → 0.4.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-daemon",
-  "version": "0.4.45",
+  "version": "0.4.47",
   "description": "Issue-driven AI development daemon. Spawns opencode subprocesses to resolve Gitea issues.",
   "module": "src/index.ts",
   "type": "module",

package/src/opencode.ts

@@ -207,13 +207,20 @@ export class RecloneStrategy implements TakeoverStrategy {
         const gitArgs = ["git"];
         if (credHelper) gitArgs.push("-c", `credential.helper=${credHelper}`);
         gitArgs.push("clone", url, dir);
+        // ssh without these can sleep forever: no TCP keepalive on a blackholed
+        // connection, and host-key/passphrase prompts block a headless daemon.
+        const sshCmd = process.env.WORK_GIT_SSH_COMMAND
+          ?? "ssh -o ConnectTimeout=10 -o ServerAliveInterval=15 -o ServerAliveCountMax=4 -o BatchMode=yes";
         let r: { exitCode: number | null; stderr?: Uint8Array | undefined };
         try {
-          // async spawn: a slow/hung remote (e.g. SSH host-key prompt) must never
-          // block the daemon event loop — spawnSync froze healthz+heartbeats for
-          // the whole clone duration. Capped at 10 minutes.
-          const proc = Bun.spawn({ cmd: gitArgs, stdout: "ignore", stderr: "pipe", env: { ...process.env, ...env } });
-          const killTimer = setTimeout(() => proc.kill("SIGKILL"), 10 * 60_000);
+          // async spawn: a slow/hung remote must never block the daemon event
+          // loop — spawnSync froze healthz+heartbeats for the whole clone
+          // duration. Capped at 10 minutes.
+          const proc = Bun.spawn({
+            cmd: gitArgs, stdout: "ignore", stderr: "pipe",
+            env: { ...process.env, ...env, GIT_SSH_COMMAND: sshCmd },
+          });
+          const killTimer = setTimeout(() => { try { proc.kill("SIGKILL"); } catch { /* already dead */ } }, 10 * 60_000);
           const [exitCode, stderr] = await Promise.all([proc.exited, new Response(proc.stderr).arrayBuffer()]);
           clearTimeout(killTimer);
           r = { exitCode, stderr: new Uint8Array(stderr) };
@@ -328,6 +335,7 @@ export class Engine {
   private lastOutputAt = new Map<string, number>();
   private startedAt = new Map<string, number>();
   private progressCommentId = new Map<string, string>();
+  private pickupCommentId = new Map<string, string>();
 
   private nudgeRounds = new Map<string, number>();
   private emptyResponseRounds = new Map<string, number>();
@@ -795,11 +803,18 @@ export class Engine {
     }
 
     const k = this.sessionKey(session, issue);
-    const workdir = await this.resolveWorkdir(session, issue);
-    log.info(`engine: session "${session.name}" created for ${k}, workdir=${workdir}`);
 
-    await tracker.createComment(ref, `[system] 🔄 **${session.name}** picked up this issue.\n> session: ${this.sessionRef(session)} | workdir: ${this.workdirLink(workdir)}`);
+    // Ack before resolving the workdir: a first-touch clone can take minutes
+    // (or hit the 10-min cap), and the user must see pickup feedback immediately.
+    // The session link is a placeholder until the backend reports its session id;
+    // the onSessionId callback rewrites this comment with the real reference.
+    await tracker.createComment(ref, `[system] 🔄 **${session.name}** picked up this issue — preparing workspace…`).then(
+      (c) => this.pickupCommentId.set(k, c.id),
+      () => {},
+    );
     void tracker.updateStatus(ref, "processing");
+    const workdir = await this.resolveWorkdir(session, issue);
+    log.info(`engine: session "${session.name}" created for ${k}, workdir=${workdir}`);
 
     const instructions = tracker.getTrackerInstructions(ref);
     const prompt = this.buildInitialPrompt(
@@ -1201,6 +1216,13 @@ export class Engine {
               await this.store.updateSession(session.id, { opencodeSessionId: id });
               session.opencodeSessionId = id;
               log.info(`engine: captured sessionID=${id.slice(0, 8)} for ${k} (early persist)`);
+              const pickupId = this.pickupCommentId.get(k);
+              if (pickupId) {
+                this.pickupCommentId.delete(k);
+                await tracker
+                  .editComment(ref, pickupId, `[system] 🔄 **${session.name}** picked up this issue.\n> session: ${this.sessionRef(session)} | workdir: ${this.workdirLink(workdir)}`)
+                  .catch((err) => log.error(`engine: failed to rewrite pickup comment for ${k}:`, (err as Error).message));
+              }
             }
           },
         },
@@ -1297,6 +1319,7 @@ export class Engine {
       return;
     }
     this.progressCommentId.delete(k);
+    this.pickupCommentId.delete(k);
     this.currentPrompt.delete(k);
     await this.persistRuntimeState(session.id);