@alook/cli 0.0.117 → 0.0.119

package/dist/index.js

@@ -62,6 +62,9 @@ class APIClient {
   patchJSON(path, body) {
     return this.request("PATCH", path, body);
   }
+  putJSON(path, body) {
+    return this.request("PUT", path, body);
+  }
   async postMultipart(path, form) {
     const headers = {
       Authorization: `Bearer ${this.token}`
@@ -14717,6 +14720,10 @@ var CreateAgentLinkRequestSchema = exports_external.object({
 var UpdateAgentLinkRequestSchema = exports_external.object({
   instruction: exports_external.string()
 });
+var UpsertAgentLinkRequestSchema = exports_external.object({
+  target_agent_id: exports_external.string().min(1, "target_agent_id is required"),
+  instruction: exports_external.string()
+});
 var AddWhitelistRequestSchema = exports_external.object({
   email: exports_external.string().email()
 });
@@ -14747,8 +14754,9 @@ var CreateConversationRequestSchema = exports_external.object({
 var CreateMessageRequestSchema = exports_external.object({
   content: exports_external.string().min(1, "content is required")
 });
-var CreateBufferedMessageRequestSchema = exports_external.object({
-  content: exports_external.string().min(1, "content is required")
+var AgentDmRequestSchema = exports_external.object({
+  content: exports_external.string().min(1, "content is required"),
+  task_id: exports_external.string().min(1).optional()
 });
 var EmailAttachmentSchema = exports_external.object({
   key: exports_external.string().min(1),
@@ -16811,6 +16819,22 @@ var agentSkill = sqliteTable("agent_skill", {
     foreignColumns: [agent.id, agent.workspaceId]
   }).onDelete("cascade")
 ]);
+var inboxUnread = sqliteTable("inbox_unread", {
+  id: text("id").primaryKey().$defaultFn(() => nanoid3()),
+  conversationId: text("conversation_id").notNull().references(() => conversation.id, { onDelete: "cascade" }),
+  userId: text("user_id").notNull().references(() => user.id, { onDelete: "cascade" }),
+  workspaceId: text("workspace_id").notNull(),
+  agentId: text("agent_id").notNull(),
+  taskId: text("task_id").notNull(),
+  taskType: text("task_type").notNull(),
+  taskStatus: text("task_status").notNull(),
+  taskPrompt: text("task_prompt"),
+  completedAt: text("completed_at").notNull(),
+  latestMessageId: text("latest_message_id")
+}, (t) => [
+  unique("inbox_unread_conv_user").on(t.conversationId, t.userId),
+  index("idx_inbox_unread_user_ws").on(t.userId, t.workspaceId, t.taskType, t.completedAt)
+]);
 // ../shared/src/db/queries/task.ts
 var DEFAULT_STALE_SECONDS = Number(process.env.ALOOK_STALE_DISPATCH_TIMEOUT_S) || 20;
 var DEFAULT_STALE_RUNNING_SECONDS = Number(process.env.ALOOK_STALE_RUNNING_TIMEOUT_S) || 3600;
@@ -18742,6 +18766,7 @@ class OpenCodeBackend {
           case "error": {
             const content = event.message || event.content || part?.error || "";
             lastError = content;
+            resultStatus = "failed";
             pushMessage({ type: "error", content });
             turnDone();
             break;
@@ -19066,6 +19091,7 @@ The CLI auto-detects your identity from the environment. No need to pass \`--age
 ### Command quick reference
 | Capability | Command |
 |---|---|
+| Send a message to the user | \`${cmdPrefix()} sync send-dm\` |
 | Schedule / list / edit tasks | \`${cmdPrefix()} calendar set\` (also list, show, update, delete) |
 | Upload a file for your owner | \`${cmdPrefix()} sync upload-artifact\` |
 | Recruit a colleague agent | \`${cmdPrefix()} agent recruit\` |
@@ -19153,6 +19179,26 @@ Upload files for your owner to review in the app.
 - You response will be rendered in remote server, so don't output link format with local path in your response (cause user can click it and jump to nowheres)
 - If you think user may need to know any file detail, use upload-artifact tool to send the file to user.
 
+### Talking to the user
+You're texting a colleague, not filing a report. The only thing the user sees is what you send with \`${cmdPrefix()} sync send-dm\` — your task output, reasoning, and tool calls are all off-screen. If you finish without sending, they got silence.
+
+\`${cmdPrefix()} sync send-dm\` sends a message to **the user** (your owner), not to a colleague agent. This is how you communicate with the human who gave you the task. Use email to talk to colleague agents.
+
+Message at milestones, the way a person would: acknowledge when you pick something up, share a real step forward or a fork in the road, and deliver the result. A quick task is often one message; a long one is a few well-spaced check-ins. Trust your read of the moment — don't narrate every small step, and don't go dark for a long stretch on something they're waiting on.
+
+Say what a colleague would say, not a transcript — the answer in your own voice. (Email- and calendar-triggered tasks have no one watching the chat; use email there.)
+
+**A real person is waiting on the other end.** Send updates at every milestone of your work — not just the final result. For any task longer than a minute:
+1. **Before you start**: tell them your plan ("I'll research X, then modify Y and Z")
+2. **During work**: update when you find something important, change direction, or hit a blocker ("Found the issue — it's in the auth module, fixing now")
+3. **When done**: deliver the clear result
+
+Don't bundle everything into one giant message at the end. The user shouldn't have to sit in silence wondering what's happening. A one-line progress update costs nothing and keeps the human in the loop. But don't send repetitive or near-identical messages — each update should carry new information, not just restate what you already said.
+
+**If the user sends you a message while you're working** — especially questions like "are you there?", "what's the status?", or unrelated requests — **respond to them immediately**. Don't finish your current task first and then reply. The user reached out because they need your attention NOW. Acknowledge them right away, then resume your work.
+
+\`${cmdPrefix()} sync send-dm --message "…"\` for short messages. For longer or markdown-rich messages, write to a file first and use \`--message-file <path>\` — this preserves formatting and avoids shell escaping issues. The conversation is in $ALOOK_CONVERSATION_ID, so you usually need no flags. You can send several times in one task.
+
 ### Attachments
 When your task includes attachments, their local paths are listed in the prompt JSON under "attachments".
 Use your Read tool to open them. Images and PDFs are read visually.
@@ -19172,6 +19218,15 @@ Recruit new colleague agents directly from the CLI. The server auto-generates a
 - Example: '${cmdPrefix()} agent recruit --instructions "You are a QA engineer..." --relationship "DELEGATE when: code is ready for review"'
 - Output: 'Recruited Felix (felix@alook.ai) — ag_xK9mPq2z'
 - The new agent shares your runtime, is automatically linked as your colleague, and receives a welcome task.
+
+Set or update the relationship with an EXISTING colleague (create-or-replace):
+- Run '${cmdPrefix()} agent link --to <handleOrId> --relationship "<DELEGATION_CRITERIA>"'
+  - '--to <handleOrId>' — target agent by email handle ('coder' or 'coder@alook.ai') or agent id ('ag_...')
+  - '--relationship <text>' — the delegation criteria both of you see (replaces it if a link already exists)
+  - '--relationship-file <path>' — alternative: read relationship from a file (mutually exclusive with --relationship)
+  - '--json' — output the link object incl. a 'created' boolean
+- Example: '${cmdPrefix()} agent link --to coder --relationship "DELEGATE when implementation is needed"'
+- Output: 'Linked Felix <-> coder (created)' (or '(updated)' when an existing link was replaced).
 `;
   content += `
 ### Calendar
@@ -19510,13 +19565,24 @@ function findRunningPidByTaskId(timelineDir, taskId) {
   }
   return null;
 }
-function findRunningEntryByContextKey(timelineDir, contextKey, provider) {
+function steerWarmupGraceMs() {
+  const raw = process.env.ALOOK_STEER_WARMUP_GRACE_MS;
+  const parsed = raw != null ? Number(raw) : NaN;
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : 30000;
+}
+function findSupersedablePredecessor(timelineDir, contextKey, provider, warmupGraceMs, now) {
   for (const filename of recentFilenames(7)) {
     const dayEntries = readJsonl(join7(timelineDir, filename));
     for (let i = dayEntries.length - 1;i >= 0; i--) {
       const entry = dayEntries[i];
       if (entry.status === "running" && entry.context_key === contextKey && entry.provider === provider) {
-        return entry;
+        if (entry.agent_started === true) {
+          return { entry, reason: "agent-started" };
+        }
+        if (now - Date.parse(entry.datetime) > warmupGraceMs) {
+          return { entry, reason: "stale" };
+        }
+        return { pending: entry };
       }
     }
   }
@@ -19598,14 +19664,14 @@ function releaseSteeringLock(baseDir, contextKey) {
 }
 
 // daemon/prompt.ts
-var DM_RESPONSE_NOTICE = "IMPORTANT: Only your final text response is visible to the user." + " Tool calls, intermediate reasoning, and mid-process outputs are NOT displayed." + " Put all key information, answers, and conclusions in your final response — that is the only thing the user will read.";
+var DM_RESPONSE_NOTICE = "Reply with `alook sync send-dm` — that's the only thing the user sees; your task output and reasoning are not shown." + " Talk to them at milestones like a colleague would, and don't end your turn without sending what they need." + " If this task will take more than 30 seconds, send a quick ack first so the user knows you're on it.";
 var EMAIL_NOTICE = "This task was triggered automatically by an incoming email. There is no human in this session." + " If you need to communicate with a human, you MUST send an email using the email sending tool." + " If you need more information or confirmation from the human, send them an email asking for it and then exit." + " Do not wait — when the human replies, a new task will be triggered automatically and you will be woken up with their response.";
 var CALENDAR_NOTICE = "This task was triggered by a scheduled calendar event. There is no human in this session." + " If you need to communicate with a human, you MUST send an email using the email sending tool." + " If you need more information or confirmation, send an email asking for it and then exit." + " Do not wait — when the human replies, a new task will be triggered automatically and you will be woken up with their response.";
 var ISSUE_NOTICE = "This task was triggered by an assigned issue. The issue_id is provided in this message." + " Use `alook issue show --issue_id <issue_id>` to read full context." + " Use `alook issue update --issue_id <issue_id> --status <status>` to change status." + " Use `alook issue comment --issue_id <issue_id> --body <text>` to leave a comment." + " CRITICAL — You MUST manage the issue status correctly. This is NOT optional:" + " 1. Set status to 'in_progress' when you start working." + " 2. If you complete the work yourself: leave a summary comment, then set status to 'review' as your last action. 'review' means there is actual completed work (code, artifact, result) ready for the owner to look at." + " 3. If you delegated work to colleagues and are waiting for their response: KEEP status as 'in_progress' and exit. This is expected — you will be woken up when they reply. Set 'review' only after all delegated work is confirmed complete." + " 4. NEVER set 'review' unless there is concrete completed work for the owner to review. Sending a plan to a colleague is NOT completed work." + " NEVER exit without doing at least one of: updating the status, or leaving a comment explaining what you did and what you're waiting for.";
 function buildDmNotice(name, email3) {
   return `This task was triggered by an incoming email on a conversation with ${name} (${email3}).` + ` ${name} is present in this session — reply to them directly.` + ` If you need to communicate with anyone else, use the email sending tool.`;
 }
-function buildPrompt(task, attachments) {
+function buildTaskObject(task, attachments) {
   const createdAt = new Date(task.createdAt);
   const receivedAt = Number.isNaN(createdAt.getTime()) ? localISOString() : localISOString(createdAt);
   const obj = {
@@ -19671,7 +19737,18 @@ function buildPrompt(task, attachments) {
       filename: a.filename
     }));
   }
-  return JSON.stringify(obj);
+  return obj;
+}
+function buildPrompt(task, attachments) {
+  return JSON.stringify(buildTaskObject(task, attachments));
+}
+function buildMergedPrompt(tasks, attachmentsMap) {
+  const subTasks = tasks.map((t) => buildTaskObject(t, attachmentsMap.get(t.id))).sort((a, b) => String(a.received_at).localeCompare(String(b.received_at)));
+  return JSON.stringify({
+    type: "merge_tasks",
+    notice: "These messages arrived simultaneously. Process each one completely.",
+    tasks: subTasks
+  });
 }
 
 // daemon/session-runner.ts
@@ -19776,8 +19853,8 @@ async function runSession(input) {
   await initEntryAsync(timelineDir, createTimelineEntry(task.id, task.prompt, task.type, undefined, process.pid, provider, task.contextKey, input.logFilePath));
   const { workDir, env } = prepare({ workspacesRoot, token }, task);
   let killed = false;
-  let agentPid = undefined;
-  let flushTimer = undefined;
+  let agentPid;
+  let flushTimer;
   const pendingMessages = [];
   let seq = 0;
   let toolCount = 0;
@@ -19863,7 +19940,7 @@ async function runSession(input) {
   }
   if (killed)
     return;
-  const prompt = buildPrompt(task, attachments);
+  const prompt = input.promptOverride ?? buildPrompt(task, attachments);
   const resumeSessionId = task.contextKey ? findResumableSessionByContextKey(timelineDir, task.contextKey, provider) ?? undefined : undefined;
   if (resumeSessionId) {
     log6.info(`resuming session ${resumeSessionId} (context_key: ${task.contextKey})`);
@@ -19888,6 +19965,8 @@ async function runSession(input) {
   log6.info(JSON.stringify({ role: "user", type: "text", content: prompt }));
   updateEntry(timelineDir, task.id, (entry) => {
     entry.session_id = earlySessionId || null;
+    if (earlySessionId)
+      entry.agent_started = true;
   });
   flushTimer = setInterval(flushMessages, FLUSH_INTERVAL_MS);
   const INACTIVITY_TIMEOUT_MS = messageInactivityTimeout ?? 5 * 60 * 1000;
@@ -20588,6 +20667,16 @@ function writeCacheFile(filePath, hash2, skills) {
   const data = { hash: hash2, skills };
   writeFileSync7(filePath, JSON.stringify(data, null, 2), "utf-8");
 }
+function isClientError2(err) {
+  if (err instanceof Error) {
+    const match = err.message.match(/^HTTP (\d+):/);
+    if (match) {
+      const status = parseInt(match[1], 10);
+      return status >= 400 && status < 500;
+    }
+  }
+  return false;
+}
 var scanTimer = null;
 var scannerConfig = null;
 var clientRef = null;
@@ -20664,7 +20753,12 @@ function runScan() {
         }));
         Promise.all(syncPromises).then(() => {
           writeCacheFile(globalCachePath(daemonId, runtime), hash2, skills);
-        }).catch((e) => log9.debug("Global skill sync failed", e));
+        }).catch((e) => {
+          if (isClientError2(e)) {
+            writeCacheFile(globalCachePath(daemonId, runtime), hash2, skills);
+          }
+          log9.debug("Global skill sync failed", e);
+        });
       }
     } catch (e) {
       log9.debug(`Global scan error for ${runtime}`, e);
@@ -20688,7 +20782,12 @@ function runScan() {
           skills: skillItems
         }).then(() => {
           writeCacheFile(agentCachePath(target.agentId, target.runtime), hash2, skills);
-        }).catch((e) => log9.debug("Agent skill sync failed", e));
+        }).catch((e) => {
+          if (isClientError2(e)) {
+            writeCacheFile(agentCachePath(target.agentId, target.runtime), hash2, skills);
+          }
+          log9.debug("Agent skill sync failed", e);
+        });
       }
     } catch (e) {
       log9.debug(`Agent scan error for ${target.agentId}:${target.runtime}`, e);
@@ -20786,7 +20885,7 @@ function pruneSessionRunnerLogs() {
     } catch {}
   }
 }
-function isClientError2(error51) {
+function isClientError3(error51) {
   if (!(error51 instanceof Error))
     return false;
   const match = error51.message.match(/^HTTP (\d+):/);
@@ -20889,7 +20988,7 @@ async function reconcilePendingCompletions(workspacesRoot) {
           log10.warn(`reconcile: delivered marker ${name} but failed to delete: ${delErr}`);
         }
       } catch (deliverErr) {
-        if (isClientError2(deliverErr)) {
+        if (isClientError3(deliverErr)) {
           try {
             await unlink(filePath);
           } catch {}
@@ -21007,6 +21106,7 @@ async function startDaemon(profile, serverUrl) {
   health.setRuntimeCount(allRuntimeIds.length);
   log10.info(`Daemon started — ${allRuntimeIds.length} runtime(s) across ${workspaceStates.length} workspace(s)`);
   const activeTasks = new Set;
+  const pendingSteer = new Map;
   const knownAgentIds = new Set(workspaces.flatMap((ws) => ws.agent_ids ?? []));
   function syncAgentId(agentId, workspaceId) {
     if (knownAgentIds.has(agentId))
@@ -21078,7 +21178,7 @@ async function startDaemon(profile, serverUrl) {
           syncAgentId(task.agentId, ws.workspaceId);
           activeTasks.add(task.id);
           remaining--;
-          handleTask(client, config2, runtimeIndex, task, ws.token, activeTasks).catch((e) => {
+          handleTask(client, config2, runtimeIndex, task, ws.token, activeTasks, pendingSteer).catch((e) => {
             log10.error("Task error", e);
             activeTasks.delete(task.id);
           });
@@ -21151,7 +21251,7 @@ async function startDaemon(profile, serverUrl) {
             continue;
           syncAgentId(task.agentId, ws.workspaceId);
           activeTasks.add(task.id);
-          handleTask(client, config2, runtimeIndex, task, ws.token, activeTasks).catch((e) => {
+          handleTask(client, config2, runtimeIndex, task, ws.token, activeTasks, pendingSteer).catch((e) => {
             log10.error("WS task error", e);
             activeTasks.delete(task.id);
           });
@@ -21223,7 +21323,7 @@ async function startDaemon(profile, serverUrl) {
             sender: null
           });
           activeTasks.add(killTask.id);
-          handleTask(client, config2, runtimeIndex, killTask, ws.token, activeTasks).catch((e) => {
+          handleTask(client, config2, runtimeIndex, killTask, ws.token, activeTasks, pendingSteer).catch((e) => {
             log10.error("WS kill task error", e);
             activeTasks.delete(killTask.id);
           });
@@ -21461,7 +21561,7 @@ async function killAndVerify(pid) {
   }
   return true;
 }
-async function handleTask(client, config2, runtimeIndex, task, token, activeTasks) {
+async function handleTask(client, config2, runtimeIndex, task, token, activeTasks, pendingSteer) {
   log10.info(`Task ${task.id} claimed agent=${task.agentId}`);
   if (task.type === TASK_TYPES.KILL_TASK) {
     const targetTaskId = task.context?.target_task_id;
@@ -21521,53 +21621,164 @@ async function handleTask(client, config2, runtimeIndex, task, token, activeTask
     return;
   }
   const provider = runtimeData.provider;
+  let promptOverride;
   if (task.contextKey) {
     const agentBaseDir = join11(config2.workspacesRoot, task.workspaceId, task.agentId, "workdir");
     cleanupStaleIntents(agentBaseDir);
     const timelineDir = join11(agentBaseDir, ".context_timeline");
-    const lockAcquired = acquireSteeringLock(agentBaseDir, task.contextKey);
+    const ctxKey = task.contextKey;
+    let lockAcquired = acquireSteeringLock(agentBaseDir, ctxKey);
     if (!lockAcquired) {
-      log10.warn(`Steering lock contention for context_key=${task.contextKey}, proceeding without steering`);
-    } else {
+      const MERGE_WAIT_MS = 5000;
+      const MERGE_POLL_MS = 50;
+      const mergeStart = Date.now();
+      while (Date.now() - mergeStart < MERGE_WAIT_MS) {
+        const existing = pendingSteer.get(ctxKey);
+        if (existing) {
+          const attachmentIds = task.context?.attachment_ids ?? [];
+          let myAttachments = [];
+          if (attachmentIds.length > 0) {
+            try {
+              myAttachments = await downloadAttachments(client, token, task.workspaceId, task.id, attachmentIds);
+            } catch {}
+          }
+          existing.tasks.push(task);
+          existing.attachments.set(task.id, myAttachments);
+          log10.info(`Steering: ${task.id} merged into pending entry (lock contention) for context_key=${ctxKey} (${existing.tasks.length} tasks)`);
+          existing.wake();
+          try {
+            await client.supersedeTask(token, task.id);
+          } catch {}
+          activeTasks.delete(task.id);
+          return;
+        }
+        lockAcquired = acquireSteeringLock(agentBaseDir, ctxKey);
+        if (lockAcquired)
+          break;
+        await new Promise((r) => setTimeout(r, MERGE_POLL_MS));
+      }
+      if (!lockAcquired) {
+        log10.warn(`Steering lock contention for context_key=${ctxKey}, proceeding without steering`);
+      }
+    }
+    if (lockAcquired) {
       try {
-        const predecessor = findRunningEntryByContextKey(timelineDir, task.contextKey, provider);
-        if (predecessor && predecessor.task_id !== task.id) {
-          log10.info(`Steering: task ${task.id} supersedes predecessor ${predecessor.task_id} (context_key=${task.contextKey})`);
-          if (predecessor.pid != null) {
-            writeKillIntent(agentBaseDir, {
-              reason: "superseded",
-              targetTaskId: predecessor.task_id,
-              expectedPid: predecessor.pid,
-              successorTaskId: task.id
+        const result = findSupersedablePredecessor(timelineDir, ctxKey, provider, steerWarmupGraceMs(), Date.now());
+        if (result) {
+          const existing = pendingSteer.get(ctxKey);
+          if (!existing) {
+            const attachmentIds = task.context?.attachment_ids ?? [];
+            let myAttachments = [];
+            if (attachmentIds.length > 0) {
+              try {
+                myAttachments = await downloadAttachments(client, token, task.workspaceId, task.id, attachmentIds);
+              } catch (e) {
+                log10.warn(`Steering: failed to download attachments for ${task.id}`, e);
+              }
+            }
+            let ownerWake;
+            const ownerSignal = new Promise((resolve2) => {
+              ownerWake = resolve2;
             });
-            try {
-              const delivered = await killAndVerify(predecessor.pid);
-              log10.info(delivered ? `Steering: terminated predecessor pid=${predecessor.pid}` : `Steering: predecessor pid=${predecessor.pid} already exited`);
-            } catch (e) {
-              log10.warn(`Steering: kill failed for pid=${predecessor.pid}`, e);
+            const entry = {
+              tasks: [task],
+              attachments: new Map([[task.id, myAttachments]]),
+              ownerTaskId: task.id,
+              wake: ownerWake
+            };
+            pendingSteer.set(ctxKey, entry);
+            let predecessor = "entry" in result ? result.entry : null;
+            if (!predecessor) {
+              log10.info(`Steering: predecessor ${result.pending.task_id} warming up; ${task.id} waiting`);
+              const POLL_MS2 = 200;
+              const MAX_WAIT_MS = steerWarmupGraceMs();
+              const waitStart = Date.now();
+              while (Date.now() - waitStart < MAX_WAIT_MS) {
+                releaseSteeringLock(agentBaseDir, ctxKey);
+                await Promise.race([new Promise((r2) => setTimeout(r2, POLL_MS2)), ownerSignal]);
+                if (!acquireSteeringLock(agentBaseDir, ctxKey))
+                  continue;
+                const r = findSupersedablePredecessor(timelineDir, ctxKey, provider, steerWarmupGraceMs(), Date.now());
+                if (!r) {
+                  log10.info(`Steering: predecessor vanished; ${task.id} proceeding`);
+                  break;
+                }
+                if ("entry" in r) {
+                  predecessor = r.entry;
+                  break;
+                }
+              }
+              if (!predecessor && Date.now() - waitStart >= MAX_WAIT_MS) {
+                releaseSteeringLock(agentBaseDir, ctxKey);
+                if (acquireSteeringLock(agentBaseDir, ctxKey)) {
+                  const finalCheck = findSupersedablePredecessor(timelineDir, ctxKey, provider, 0, Date.now());
+                  if (finalCheck && "entry" in finalCheck)
+                    predecessor = finalCheck.entry;
+                }
+              }
+            }
+            if (predecessor && predecessor.task_id !== task.id) {
+              log10.info(`Steering: task ${task.id} supersedes predecessor ${predecessor.task_id} (context_key=${ctxKey})`);
+              if (predecessor.pid != null) {
+                writeKillIntent(agentBaseDir, { reason: "superseded", targetTaskId: predecessor.task_id, expectedPid: predecessor.pid, successorTaskId: task.id });
+                try {
+                  const delivered = await killAndVerify(predecessor.pid);
+                  log10.info(delivered ? `Steering: terminated predecessor pid=${predecessor.pid}` : `Steering: predecessor pid=${predecessor.pid} already exited`);
+                } catch (e) {
+                  log10.warn(`Steering: kill failed for pid=${predecessor.pid}`, e);
+                }
+                const killWaitStart = Date.now();
+                while (Date.now() - killWaitStart < 15000) {
+                  if (findRunningPidByTaskId(timelineDir, predecessor.task_id) == null)
+                    break;
+                  await new Promise((r) => setTimeout(r, 200));
+                }
+              }
+              try {
+                await client.supersedeTask(token, predecessor.task_id);
+              } catch {}
             }
-            const waitStart = Date.now();
-            const MAX_WAIT_MS = 15000;
-            const POLL_MS2 = 200;
-            while (Date.now() - waitStart < MAX_WAIT_MS) {
-              const stillRunning = findRunningPidByTaskId(timelineDir, predecessor.task_id);
-              if (stillRunning == null)
-                break;
-              await new Promise((r) => setTimeout(r, POLL_MS2));
+            const finalEntry = pendingSteer.get(ctxKey);
+            if (finalEntry && finalEntry.tasks.length > 1) {
+              promptOverride = buildMergedPrompt(finalEntry.tasks, finalEntry.attachments);
+              log10.info(`Steering: merged ${finalEntry.tasks.length} tasks for context_key=${ctxKey}`);
+            } else if (finalEntry && finalEntry.tasks.length === 1) {
+              const att = finalEntry.attachments.get(task.id);
+              if (att && att.length > 0) {
+                promptOverride = buildPrompt(task, att);
+              }
             }
-            if (findRunningPidByTaskId(timelineDir, predecessor.task_id) != null) {
-              log10.warn(`Steering: predecessor pid=${predecessor.pid} did not exit within ${MAX_WAIT_MS}ms, proceeding anyway`);
+            pendingSteer.delete(ctxKey);
+          } else {
+            const attachmentIds = task.context?.attachment_ids ?? [];
+            let myAttachments = [];
+            if (attachmentIds.length > 0) {
+              try {
+                myAttachments = await downloadAttachments(client, token, task.workspaceId, task.id, attachmentIds);
+              } catch (e) {
+                log10.warn(`Steering: failed to download attachments for ${task.id}`, e);
+              }
             }
-          }
-          try {
-            await client.supersedeTask(token, predecessor.task_id);
-            log10.info(`Steering: predecessor ${predecessor.task_id} marked superseded`);
-          } catch (e) {
-            log10.warn(`Steering: failed to mark predecessor superseded server-side`, e);
+            for (const prev of existing.tasks) {
+              if (prev.id !== existing.ownerTaskId) {
+                try {
+                  await client.supersedeTask(token, prev.id);
+                } catch {}
+              }
+            }
+            existing.tasks.push(task);
+            existing.attachments.set(task.id, myAttachments);
+            log10.info(`Steering: ${task.id} merged into pending entry for context_key=${ctxKey} (${existing.tasks.length} tasks)`);
+            existing.wake();
+            try {
+              await client.supersedeTask(token, task.id);
+            } catch {}
+            activeTasks.delete(task.id);
+            return;
           }
         }
       } finally {
-        releaseSteeringLock(agentBaseDir, task.contextKey);
+        releaseSteeringLock(agentBaseDir, ctxKey);
       }
     }
   }
@@ -21584,7 +21795,8 @@ async function handleTask(client, config2, runtimeIndex, task, token, activeTask
     token,
     workspacesRoot: config2.workspacesRoot,
     agentTimeout: config2.agentTimeout,
-    messageInactivityTimeout: config2.messageInactivityTimeout
+    messageInactivityTimeout: config2.messageInactivityTimeout,
+    ...promptOverride && { promptOverride }
   };
   const child = spawnSessionRunner(input);
   child.on("close", async (code) => {
@@ -21593,31 +21805,31 @@ async function handleTask(client, config2, runtimeIndex, task, token, activeTask
       const agentBaseDir = join11(config2.workspacesRoot, task.workspaceId, task.agentId, "workdir");
       const killIntent = readKillIntent(agentBaseDir, task.id);
       if (killIntent) {
-        log10.info(`Task ${task.id} exited due to kill intent — skipping failTask`);
+        log10.info(`Task ${task.id} exited (${killIntent.reason}) — expected, skipping failTask`);
         clearKillIntent(agentBaseDir, task.id);
         return;
       }
-      const msg = code === null ? `session-runner killed by signal (task ${task.id})` : `session-runner crashed (exit code ${code}, task ${task.id})`;
-      log10.warn(msg);
-      const timelineDir = join11(agentBaseDir, ".context_timeline");
-      updateEntry(timelineDir, task.id, (entry) => {
-        entry.pid = null;
-        entry.status = "failed";
-        entry.errmsg = msg;
-      });
+      const errorMsg = code === null ? "killed by signal" : `session-runner exited with code ${code}`;
       try {
-        await client.failTask(token, task.id, msg);
+        await client.failTask(token, task.id, errorMsg);
+        log10.warn(`session-runner crashed (${errorMsg}, task ${task.id})`);
+        const timelineDir = join11(agentBaseDir, ".context_timeline");
+        updateEntry(timelineDir, task.id, (entry) => {
+          entry.pid = null;
+          entry.status = "failed";
+          entry.errmsg = errorMsg;
+        });
       } catch (e) {
-        if (isClientError2(e)) {
-          log10.info(`Backstop: task ${task.id} already in terminal state`);
+        if (isClientError3(e)) {
+          log10.info(`Task ${task.id} exited (already terminal) — session-runner handled cleanup`);
           return;
         }
-        log10.error(`Backstop: failed to report crash for task ${task.id}`, e);
+        log10.error(`Failed to report crash for task ${task.id}`, e);
         try {
           await writeMarkerFile(config2.workspacesRoot, {
             taskId: task.id,
             type: "fail",
-            payload: { error: msg },
+            payload: { error: errorMsg },
             token,
             serverURL: config2.serverURL,
             createdAt: new Date().toISOString()
@@ -22702,6 +22914,57 @@ function agentCommand() {
       process.exit(1);
     }
   });
+  cmd.command("link").description("Set (create-or-replace) the relationship with an existing colleague agent").option("--agent_id <id>", "Calling agent ID (or set ALOOK_AGENT_ID env var)").option("--to <handleOrId>", "Target agent: email handle (coder / coder@alook.ai) or agent id (ag_...)").option("--relationship <text>", "Relationship/delegation instruction for the link").option("--relationship-file <path>", "Read relationship from a file").option("--json", "Output as JSON").action(async (opts, command) => {
+    const relationship = readField({ inline: opts.relationship, file: opts.relationshipFile }, "relationship", "relationship-file");
+    if (!relationship) {
+      console.error("Error: --relationship or --relationship-file is required");
+      process.exit(1);
+    }
+    const to = opts.to;
+    if (!to) {
+      console.error("Error: --to <handleOrId> is required");
+      process.exit(1);
+    }
+    const agentId = resolveAgentId(opts);
+    const { serverUrl, token, workspaceId } = resolveClientOpts(command, { agentId });
+    const client = new APIClient(serverUrl, token, workspaceId);
+    try {
+      let targetAgentId;
+      let agents = null;
+      if (to.startsWith("ag_")) {
+        targetAgentId = to;
+      } else {
+        const handle = to.split("@")[0].toLowerCase();
+        agents = await client.getJSON("/api/agents");
+        const match = agents.find((a) => (a.email_handle || "").toLowerCase() === handle);
+        if (!match) {
+          console.error(`Error: no agent with handle '${handle}' in this workspace`);
+          process.exit(1);
+        }
+        targetAgentId = match.id;
+      }
+      const res = await client.putJSON(`/api/agent-links?agentId=${encodeURIComponent(agentId)}`, {
+        target_agent_id: targetAgentId,
+        instruction: relationship
+      });
+      if (opts.json)
+        return printJSON(res);
+      if (!agents) {
+        try {
+          agents = await client.getJSON("/api/agents");
+        } catch {
+          agents = [];
+        }
+      }
+      const label = (id) => agents.find((a) => a.id === id)?.name || id;
+      const meLabel = label(agentId);
+      const targetLabel = label(targetAgentId);
+      console.log(`Linked ${meLabel} <-> ${targetLabel} (${res.created ? "created" : "updated"})`);
+    } catch (err) {
+      console.error(`Error: ${err instanceof Error ? err.message : err}`);
+      process.exit(1);
+    }
+  });
   return cmd;
 }
 
@@ -22755,7 +23018,7 @@ import { Command as Command12 } from "commander";
 import { readFileSync as readFileSync13 } from "fs";
 import { basename as basename3 } from "path";
 function syncCommand() {
-  const cmd = new Command12("sync").description("File sync utilities");
+  const cmd = new Command12("sync").description("Sync info with the user (files, messages)");
   cmd.command("upload-artifact").description("Upload a file artifact to a conversation").option("--agent_id <id>", "Agent ID").requiredOption("--conversation_id <id>", "Conversation ID").requiredOption("--file <path>", "Path to file to upload").action(async (opts, command) => {
     const agentId = resolveAgentId(opts);
     const { serverUrl, token, workspaceId } = resolveClientOpts(command, { agentId });
@@ -22781,6 +23044,43 @@ function syncCommand() {
       process.exit(1);
     }
   });
+  cmd.command("send-dm").description("Send a message to the user in the current conversation (the agent's voice)").option("--agent_id <id>", "Agent ID").option("--conversation_id <id>", "Conversation ID (defaults to $ALOOK_CONVERSATION_ID)").option("--message <text>", "Message body").option("--message-file <path>", "Read message body from a file").action(async (opts, command) => {
+    if (opts.message && opts.messageFile) {
+      console.error("Error: --message and --message-file are mutually exclusive");
+      process.exit(1);
+    }
+    let content;
+    if (opts.messageFile) {
+      try {
+        content = readFileSync13(opts.messageFile, "utf-8");
+      } catch (err) {
+        console.error(`Error: cannot read file "${opts.messageFile}": ${err.message}`);
+        process.exit(1);
+      }
+    } else {
+      content = (opts.message ?? "").replace(/\\n/g, `
+`).replace(/\\t/g, "\t");
+    }
+    if (!content.trim()) {
+      console.error("Error: --message or --message-file is required (and must not be empty)");
+      process.exit(1);
+    }
+    const conversationId = opts.conversation_id || process.env.ALOOK_CONVERSATION_ID;
+    if (!conversationId) {
+      console.error("Error: no conversation id (set --conversation_id or $ALOOK_CONVERSATION_ID)");
+      process.exit(1);
+    }
+    const agentId = resolveAgentId(opts);
+    const { serverUrl, token, workspaceId } = resolveClientOpts(command, { agentId });
+    const client = new APIClient(serverUrl, token, workspaceId);
+    try {
+      const result = await client.postJSON(`/api/daemon/conversations/${encodeURIComponent(conversationId)}/messages`, { content, task_id: process.env.ALOOK_TASK_ID || undefined });
+      printJSON(result);
+    } catch (err) {
+      console.error(`Error sending message: ${err.message}`);
+      process.exit(1);
+    }
+  });
   return cmd;
 }
 

package/dist/session-runner.js

@@ -14631,6 +14631,10 @@ var CreateAgentLinkRequestSchema = exports_external.object({
 var UpdateAgentLinkRequestSchema = exports_external.object({
   instruction: exports_external.string()
 });
+var UpsertAgentLinkRequestSchema = exports_external.object({
+  target_agent_id: exports_external.string().min(1, "target_agent_id is required"),
+  instruction: exports_external.string()
+});
 var AddWhitelistRequestSchema = exports_external.object({
   email: exports_external.string().email()
 });
@@ -14661,8 +14665,9 @@ var CreateConversationRequestSchema = exports_external.object({
 var CreateMessageRequestSchema = exports_external.object({
   content: exports_external.string().min(1, "content is required")
 });
-var CreateBufferedMessageRequestSchema = exports_external.object({
-  content: exports_external.string().min(1, "content is required")
+var AgentDmRequestSchema = exports_external.object({
+  content: exports_external.string().min(1, "content is required"),
+  task_id: exports_external.string().min(1).optional()
 });
 var EmailAttachmentSchema = exports_external.object({
   key: exports_external.string().min(1),
@@ -16725,6 +16730,22 @@ var agentSkill = sqliteTable("agent_skill", {
     foreignColumns: [agent.id, agent.workspaceId]
   }).onDelete("cascade")
 ]);
+var inboxUnread = sqliteTable("inbox_unread", {
+  id: text("id").primaryKey().$defaultFn(() => nanoid3()),
+  conversationId: text("conversation_id").notNull().references(() => conversation.id, { onDelete: "cascade" }),
+  userId: text("user_id").notNull().references(() => user.id, { onDelete: "cascade" }),
+  workspaceId: text("workspace_id").notNull(),
+  agentId: text("agent_id").notNull(),
+  taskId: text("task_id").notNull(),
+  taskType: text("task_type").notNull(),
+  taskStatus: text("task_status").notNull(),
+  taskPrompt: text("task_prompt"),
+  completedAt: text("completed_at").notNull(),
+  latestMessageId: text("latest_message_id")
+}, (t) => [
+  unique("inbox_unread_conv_user").on(t.conversationId, t.userId),
+  index("idx_inbox_unread_user_ws").on(t.userId, t.workspaceId, t.taskType, t.completedAt)
+]);
 // ../shared/src/db/queries/task.ts
 var DEFAULT_STALE_SECONDS = Number(process.env.ALOOK_STALE_DISPATCH_TIMEOUT_S) || 20;
 var DEFAULT_STALE_RUNNING_SECONDS = Number(process.env.ALOOK_STALE_RUNNING_TIMEOUT_S) || 3600;
@@ -18007,6 +18028,7 @@ class OpenCodeBackend {
           case "error": {
             const content = event.message || event.content || part?.error || "";
             lastError = content;
+            resultStatus = "failed";
             pushMessage({ type: "error", content });
             turnDone();
             break;
@@ -18288,6 +18310,7 @@ The CLI auto-detects your identity from the environment. No need to pass \`--age
 ### Command quick reference
 | Capability | Command |
 |---|---|
+| Send a message to the user | \`${cmdPrefix()} sync send-dm\` |
 | Schedule / list / edit tasks | \`${cmdPrefix()} calendar set\` (also list, show, update, delete) |
 | Upload a file for your owner | \`${cmdPrefix()} sync upload-artifact\` |
 | Recruit a colleague agent | \`${cmdPrefix()} agent recruit\` |
@@ -18375,6 +18398,26 @@ Upload files for your owner to review in the app.
 - You response will be rendered in remote server, so don't output link format with local path in your response (cause user can click it and jump to nowheres)
 - If you think user may need to know any file detail, use upload-artifact tool to send the file to user.
 
+### Talking to the user
+You're texting a colleague, not filing a report. The only thing the user sees is what you send with \`${cmdPrefix()} sync send-dm\` — your task output, reasoning, and tool calls are all off-screen. If you finish without sending, they got silence.
+
+\`${cmdPrefix()} sync send-dm\` sends a message to **the user** (your owner), not to a colleague agent. This is how you communicate with the human who gave you the task. Use email to talk to colleague agents.
+
+Message at milestones, the way a person would: acknowledge when you pick something up, share a real step forward or a fork in the road, and deliver the result. A quick task is often one message; a long one is a few well-spaced check-ins. Trust your read of the moment — don't narrate every small step, and don't go dark for a long stretch on something they're waiting on.
+
+Say what a colleague would say, not a transcript — the answer in your own voice. (Email- and calendar-triggered tasks have no one watching the chat; use email there.)
+
+**A real person is waiting on the other end.** Send updates at every milestone of your work — not just the final result. For any task longer than a minute:
+1. **Before you start**: tell them your plan ("I'll research X, then modify Y and Z")
+2. **During work**: update when you find something important, change direction, or hit a blocker ("Found the issue — it's in the auth module, fixing now")
+3. **When done**: deliver the clear result
+
+Don't bundle everything into one giant message at the end. The user shouldn't have to sit in silence wondering what's happening. A one-line progress update costs nothing and keeps the human in the loop. But don't send repetitive or near-identical messages — each update should carry new information, not just restate what you already said.
+
+**If the user sends you a message while you're working** — especially questions like "are you there?", "what's the status?", or unrelated requests — **respond to them immediately**. Don't finish your current task first and then reply. The user reached out because they need your attention NOW. Acknowledge them right away, then resume your work.
+
+\`${cmdPrefix()} sync send-dm --message "…"\` for short messages. For longer or markdown-rich messages, write to a file first and use \`--message-file <path>\` — this preserves formatting and avoids shell escaping issues. The conversation is in $ALOOK_CONVERSATION_ID, so you usually need no flags. You can send several times in one task.
+
 ### Attachments
 When your task includes attachments, their local paths are listed in the prompt JSON under "attachments".
 Use your Read tool to open them. Images and PDFs are read visually.
@@ -18394,6 +18437,15 @@ Recruit new colleague agents directly from the CLI. The server auto-generates a
 - Example: '${cmdPrefix()} agent recruit --instructions "You are a QA engineer..." --relationship "DELEGATE when: code is ready for review"'
 - Output: 'Recruited Felix (felix@alook.ai) — ag_xK9mPq2z'
 - The new agent shares your runtime, is automatically linked as your colleague, and receives a welcome task.
+
+Set or update the relationship with an EXISTING colleague (create-or-replace):
+- Run '${cmdPrefix()} agent link --to <handleOrId> --relationship "<DELEGATION_CRITERIA>"'
+  - '--to <handleOrId>' — target agent by email handle ('coder' or 'coder@alook.ai') or agent id ('ag_...')
+  - '--relationship <text>' — the delegation criteria both of you see (replaces it if a link already exists)
+  - '--relationship-file <path>' — alternative: read relationship from a file (mutually exclusive with --relationship)
+  - '--json' — output the link object incl. a 'created' boolean
+- Example: '${cmdPrefix()} agent link --to coder --relationship "DELEGATE when implementation is needed"'
+- Output: 'Linked Felix <-> coder (created)' (or '(updated)' when an existing link was replaced).
 `;
   content += `
 ### Calendar
@@ -18748,14 +18800,14 @@ function clearKillIntent(baseDir, taskId) {
 }
 
 // daemon/prompt.ts
-var DM_RESPONSE_NOTICE = "IMPORTANT: Only your final text response is visible to the user." + " Tool calls, intermediate reasoning, and mid-process outputs are NOT displayed." + " Put all key information, answers, and conclusions in your final response — that is the only thing the user will read.";
+var DM_RESPONSE_NOTICE = "Reply with `alook sync send-dm` — that's the only thing the user sees; your task output and reasoning are not shown." + " Talk to them at milestones like a colleague would, and don't end your turn without sending what they need." + " If this task will take more than 30 seconds, send a quick ack first so the user knows you're on it.";
 var EMAIL_NOTICE = "This task was triggered automatically by an incoming email. There is no human in this session." + " If you need to communicate with a human, you MUST send an email using the email sending tool." + " If you need more information or confirmation from the human, send them an email asking for it and then exit." + " Do not wait — when the human replies, a new task will be triggered automatically and you will be woken up with their response.";
 var CALENDAR_NOTICE = "This task was triggered by a scheduled calendar event. There is no human in this session." + " If you need to communicate with a human, you MUST send an email using the email sending tool." + " If you need more information or confirmation, send an email asking for it and then exit." + " Do not wait — when the human replies, a new task will be triggered automatically and you will be woken up with their response.";
 var ISSUE_NOTICE = "This task was triggered by an assigned issue. The issue_id is provided in this message." + " Use `alook issue show --issue_id <issue_id>` to read full context." + " Use `alook issue update --issue_id <issue_id> --status <status>` to change status." + " Use `alook issue comment --issue_id <issue_id> --body <text>` to leave a comment." + " CRITICAL — You MUST manage the issue status correctly. This is NOT optional:" + " 1. Set status to 'in_progress' when you start working." + " 2. If you complete the work yourself: leave a summary comment, then set status to 'review' as your last action. 'review' means there is actual completed work (code, artifact, result) ready for the owner to look at." + " 3. If you delegated work to colleagues and are waiting for their response: KEEP status as 'in_progress' and exit. This is expected — you will be woken up when they reply. Set 'review' only after all delegated work is confirmed complete." + " 4. NEVER set 'review' unless there is concrete completed work for the owner to review. Sending a plan to a colleague is NOT completed work." + " NEVER exit without doing at least one of: updating the status, or leaving a comment explaining what you did and what you're waiting for.";
 function buildDmNotice(name, email3) {
   return `This task was triggered by an incoming email on a conversation with ${name} (${email3}).` + ` ${name} is present in this session — reply to them directly.` + ` If you need to communicate with anyone else, use the email sending tool.`;
 }
-function buildPrompt(task, attachments) {
+function buildTaskObject(task, attachments) {
   const createdAt = new Date(task.createdAt);
   const receivedAt = Number.isNaN(createdAt.getTime()) ? localISOString() : localISOString(createdAt);
   const obj = {
@@ -18821,7 +18873,10 @@ function buildPrompt(task, attachments) {
       filename: a.filename
     }));
   }
-  return JSON.stringify(obj);
+  return obj;
+}
+function buildPrompt(task, attachments) {
+  return JSON.stringify(buildTaskObject(task, attachments));
 }
 
 // daemon/session-runner.ts
@@ -18926,8 +18981,8 @@ async function runSession(input) {
   await initEntryAsync(timelineDir, createTimelineEntry(task.id, task.prompt, task.type, undefined, process.pid, provider, task.contextKey, input.logFilePath));
   const { workDir, env } = prepare({ workspacesRoot, token }, task);
   let killed = false;
-  let agentPid = undefined;
-  let flushTimer = undefined;
+  let agentPid;
+  let flushTimer;
   const pendingMessages = [];
   let seq = 0;
   let toolCount = 0;
@@ -19013,7 +19068,7 @@ async function runSession(input) {
   }
   if (killed)
     return;
-  const prompt = buildPrompt(task, attachments);
+  const prompt = input.promptOverride ?? buildPrompt(task, attachments);
   const resumeSessionId = task.contextKey ? findResumableSessionByContextKey(timelineDir, task.contextKey, provider) ?? undefined : undefined;
   if (resumeSessionId) {
     log5.info(`resuming session ${resumeSessionId} (context_key: ${task.contextKey})`);
@@ -19038,6 +19093,8 @@ async function runSession(input) {
   log5.info(JSON.stringify({ role: "user", type: "text", content: prompt }));
   updateEntry(timelineDir, task.id, (entry) => {
     entry.session_id = earlySessionId || null;
+    if (earlySessionId)
+      entry.agent_started = true;
   });
   flushTimer = setInterval(flushMessages, FLUSH_INTERVAL_MS);
   const INACTIVITY_TIMEOUT_MS = messageInactivityTimeout ?? 5 * 60 * 1000;
@@ -19179,5 +19236,7 @@ if (isDirectExecution) {
 export {
   writeMarkerFile,
   runSession,
-  reportToServer
+  reportToServer,
+  downloadAttachments,
+  cleanupAttachments
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alook/cli",
-  "version": "0.0.117",
+  "version": "0.0.119",
   "description": "Alook CLI — Enable Your Person Colleague",
   "license": "Apache-2.0",
   "homepage": "https://github.com/alookai/alook#readme",