agent-relay-runner 0.30.1 → 0.31.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-runner",
-  "version": "0.30.1",
+  "version": "0.31.1",
   "description": "Unified provider lifecycle runner for Agent Relay",
   "type": "module",
   "bin": {

package/plugins/claude/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "agent-relay-runner",
   "description": "Thin Agent Relay runner bridge for Claude Code",
-  "version": "0.30.1",
+  "version": "0.31.1",
   "agentRelayContracts": {
     "providerPluginProtocol": 1
   }

package/src/config.ts

@@ -1,7 +1,9 @@
+import { execFileSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
 import { join, resolve } from "node:path";
 import { DEFAULT_RELAY_URL, stringValue } from "agent-relay-sdk";
+import type { WorkspaceMetadata } from "agent-relay-sdk";
 import { sanitizeFsName } from "agent-relay-sdk/fs-name";
 import type { ProviderConfig } from "./adapter";
 
@@ -101,6 +103,37 @@ export function runnerId(provider: string, cwd: string, label?: string): string
   return `${hostname()}-${provider}-${cleanLabel}-${crypto.randomUUID().slice(0, 8)}`;
 }
 
+/**
+ * Stable project identifier for insights aggregation: the repo NAME, never a
+ * per-branch/per-session worktree dir or full path. Isolated workspace agents run
+ * from a session-specific worktree (…/workspaces/<repo>/<id>) whose basename is
+ * unique per session — using it would scatter one repo's data across many "projects"
+ * and break per-project rollups. So we resolve up to the main repo root, then take
+ * its basename. Falls back to the git toplevel of cwd (handles a direct agent
+ * launched in a subdir), then to the cwd basename for a non-git directory.
+ */
+export function resolveProjectName(cwd: string, workspace?: WorkspaceMetadata): string {
+  const root =
+    workspace?.repoRoot ||
+    workspace?.probe?.repoRoot ||
+    gitToplevel(cwd) ||
+    workspace?.sourceCwd ||
+    cwd;
+  return root.split("/").filter(Boolean).at(-1) || "unknown";
+}
+
+function gitToplevel(cwd: string): string | undefined {
+  try {
+    const out = execFileSync("git", ["-C", cwd, "rev-parse", "--show-toplevel"], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+    }).trim();
+    return out || undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 export function resolveCwd(value: string | undefined, fallback: string): string {
   return resolve(value || fallback);
 }

package/src/runner.ts

@@ -7,6 +7,7 @@ import { errMessage, RelayBusClient, RelayHttpClient } from "agent-relay-sdk";
 import { contextStateFromProbeMetrics, readContextProbeState } from "agent-relay-sdk/context-probe";
 import type { ManagedProcess, ProviderAdapter, ProviderConfig, ProviderPermissionDecision, ProviderPermissionDecisionInput, ProviderSessionEvent, ProviderStatusUpdate, RunnerSpawnConfig, SemanticStatus, TerminalAttachSpec } from "./adapter";
 import { messagesWithCachedAttachments } from "./attachment-cache";
+import { resolveProjectName } from "./config";
 import { ClaimTracker } from "./claim-tracker";
 import { startControlServer, type ControlServer } from "./control-server";
 import { ReplyObligationCache } from "./reply-obligation-cache";
@@ -129,7 +130,11 @@ const INTERRUPT_RECONCILE_DELAY_MS = 1_500;
 // Relay-injected content (delivered messages, memory context) is wrapped with
 // these markers; a UserPromptSubmit echo starting with one is a runner injection,
 // not a human typing into the terminal, so it must not be mirrored as a prompt.
-const RELAY_INJECTION_MARKERS = ["[relay message #", "[agent-relay"];
+// `<task-notification>` is the harness wrapper for async monitor/task wake-ups
+// (which embed a `[relay message #…]` deeper inside, defeating a plain prefix
+// match) — it is emitted only by the harness, never typed by a human, so any
+// echo starting with it is a system injection, not a user prompt (#289).
+const RELAY_INJECTION_MARKERS = ["[relay message #", "[agent-relay", "<task-notification>"];
 // Reasoning tailer poll cadence (item 5). Coarse on purpose — reasoning is a
 // discreet progress signal, not a token stream, so ~1.2s keeps it light.
 const REASONING_POLL_MS = 1_200;
@@ -202,6 +207,9 @@ export class AgentRunner {
   // (transcript rotated, Codex buffer trimmed) resets the cursor.
   private insightsObserved = 0;
   private insightsCursorKey = "";
+  // Memoized repo-name project id for insight observations (resolved once; involves a
+  // git toplevel lookup for direct agents). Aggregates by repo, not per-session worktree.
+  private insightProjectName?: string;
   // Coalesces concurrent pre-session-destroy runs (e.g. the shutdown bus command and the
   // SessionEnd hook both fire for the same teardown) so the cursor isn't raced.
   private preDestroyPromise?: Promise<void>;
@@ -453,6 +461,10 @@ export class AgentRunner {
       AGENT_RELAY_RUNNER_ID: this.options.runnerId,
       AGENT_RELAY_PROVIDER_SESSION_ID: this.providerSessionId,
       AGENT_RELAY_ID: this.agentId,
+      // The repo-name project id the runner uses for insight observations. Exposed so
+      // agent-side signals (e.g. /introspect) tag the SAME project and aggregate together,
+      // instead of the agent's worktree cwd splitting one repo into many "projects".
+      AGENT_RELAY_PROJECT: this.insightProject(),
       ...(this.scratch ? { AGENT_RELAY_SCRATCH_DIR: this.scratch.tmpDir } : {}),
       AGENT_RELAY_URL: this.options.relayUrl,
       AGENT_RELAY_APPROVAL: this.options.approvalMode,
@@ -1217,7 +1229,7 @@ export class AgentRunner {
         kind: "insight",
         payload: {
           sessionId: this.providerSessionId,
-          project: this.options.cwd,
+          project: this.insightProject(),
           agentId: this.agentId,
           signal: "hook_fatal",
           value: { hook: report.hook, error: report.error },
@@ -1266,6 +1278,17 @@ export class AgentRunner {
       : input.reason === "clear" ? "clear"
       : "shutdown";
     await this.runPreSessionDestroy(reason, { transcriptPath: input.transcriptPath });
+    // clear/compact CONTINUE the session — the finalizing window is transient. The bus-command
+    // path (handleCommand) restores the addressable status in its finally; the hook path has no
+    // such teardown, so without this the dashboard stays stuck on "wrapping up — messaging
+    // paused" with the composer disabled forever. Only restore if we're still in the exact
+    // finalizing state we published — a concurrent bus command (kill/restart/shutdown) may have
+    // transitioned lifecycleAction since, and that must win. "shutdown" reasons end the session,
+    // so their finalizing state is superseded by going offline; leave it be.
+    if ((reason === "clear" || reason === "compact") && this.lifecycleAction === `finalizing-${reason}` && !this.stopped) {
+      this.lifecycleAction = undefined;
+      this.publishStatus();
+    }
   }
 
   // The pre-session-destroy seam (#183): the single place end-of-session work runs before
@@ -1305,6 +1328,13 @@ export class AgentRunner {
   // into the shared SessionEvent stream; the math + classifier live in session-insights.ts.
   // Per-segment via a runner-side cursor, so each datapoint is one work chunk between
   // context resets. Mechanical, model-free → zero agent tokens, un-gameable.
+  // Repo-name project id for insight observations, resolved once. Aggregating by the raw
+  // cwd would split one repo across many "projects" (each isolated agent runs from a
+  // unique per-session worktree dir). See resolveProjectName.
+  private insightProject(): string {
+    return (this.insightProjectName ??= resolveProjectName(this.options.cwd, this.options.workspace));
+  }
+
   private async captureContextRatio(reason: SessionDestroyReason, opts?: { transcriptPath?: string }): Promise<void> {
     const adapter = this.options.adapter;
     if (!adapter.collectSessionEvents || !this.process) return;
@@ -1326,7 +1356,7 @@ export class AgentRunner {
       kind: "insight",
       payload: {
         sessionId: this.providerSessionId,
-        project: this.options.cwd,
+        project: this.insightProject(),
         agentId: this.agentId,
         signal: "context_ratio",
         value: { ...analysis.metric, endReason: reason },