agor-live 0.17.2 → 0.17.3

package/dist/core/sessions/index.d.cts

@@ -0,0 +1,79 @@
+import { M as ModelConfigInput, R as ResolvedModelConfig } from '../resolve-config-DTCxuSBx.cjs';
+import { c as AgenticToolName, g as CodexSandboxMode, d as CodexApprovalPolicy, e as CodexNetworkAccess } from '../agentic-tool-BulhIUGb.cjs';
+import { P as PermissionMode, a as Session } from '../session-MNU4BQv4.cjs';
+import { q as User } from '../user-CpfkcV2C.cjs';
+import '../id-CoIbY_uc.cjs';
+import '../context-BpkCELpO.cjs';
+
+/**
+ * Session creation config resolution
+ *
+ * Single source of truth for "given a user (and optional overrides), what
+ * permission_config / model_config / mcp_server_ids should this new session
+ * be stamped with?"
+ *
+ * This collapses the resolution dance that was duplicated across:
+ * - `apps/agor-daemon/src/mcp/tools/sessions.ts`   (`agor_sessions_create`)
+ * - `apps/agor-daemon/src/mcp/tools/worktrees.ts`  (`agor_worktrees_set_zone`)
+ * - `apps/agor-daemon/src/services/gateway.ts`     (gateway session creation)
+ * - `apps/agor-daemon/src/services/sessions.ts`    (cross-tool spawn fallback)
+ * - `apps/agor-daemon/src/utils/apply-session-config-defaults.ts` (the
+ *   `before:create` hook, which applies these defaults to ANY caller — UI
+ *   drag-into-zone, raw REST, etc. — that omits permission/model config)
+ *
+ * Resolution order (highest priority first):
+ *   1. `overrides.*`         — explicit caller intent
+ *   2. `user.default_agentic_config[tool].*`  — user's saved default for this tool
+ *   3. Hardcoded `getDefaultPermissionMode(tool)` (permission only) /
+ *      `undefined` (model)
+ *
+ * MCP server inheritance (separate axis):
+ *   1. `overrides.mcpServerIds`  — explicit (incl. empty array = "no MCPs")
+ *   2. `worktree.mcp_server_ids` — worktree-level override
+ *   3. `user.default_agentic_config[tool].mcpServerIds`
+ *   4. `[]`
+ */
+
+/** Explicit per-call overrides. Each field, when defined, wins over user defaults. */
+interface SessionDefaultsOverrides {
+    permissionMode?: PermissionMode;
+    modelConfig?: ModelConfigInput;
+    codexSandboxMode?: CodexSandboxMode;
+    codexApprovalPolicy?: CodexApprovalPolicy;
+    codexNetworkAccess?: CodexNetworkAccess;
+    /**
+     * Explicit MCP server ID list. An empty array means "no MCPs" — does NOT
+     * fall through to worktree/user defaults. Pass `undefined` to fall through.
+     */
+    mcpServerIds?: string[];
+}
+interface ResolveSessionDefaultsArgs {
+    agenticTool: AgenticToolName;
+    /** User whose `default_agentic_config[tool]` provides the next-priority defaults. */
+    user?: Pick<User, 'default_agentic_config'> | null;
+    /** Optional worktree for MCP server inheritance (worktree-level overrides user defaults). */
+    worktree?: {
+        mcp_server_ids?: string[] | null;
+    } | null;
+    overrides?: SessionDefaultsOverrides;
+    /** Override `new Date()` for deterministic tests. */
+    now?: Date;
+}
+interface ResolvedSessionDefaults {
+    /** Always populated — falls back to `getDefaultPermissionMode(tool)` mapped through `mapPermissionMode`. */
+    permission_config: NonNullable<Session['permission_config']>;
+    /** Optional — `undefined` when neither overrides nor user defaults specify a model. */
+    model_config?: ResolvedModelConfig;
+    /** Resolved MCP server list. Empty array means "no MCPs". */
+    mcp_server_ids: string[];
+}
+/**
+ * Resolve session creation defaults from caller overrides + user defaults.
+ *
+ * The returned `permission_config` is always populated (using the system
+ * fallback when nothing else applies), so callers can persist it directly.
+ * `model_config` may be `undefined` when no model has been chosen anywhere.
+ */
+declare function resolveSessionDefaults(args: ResolveSessionDefaultsArgs): ResolvedSessionDefaults;
+
+export { type ResolveSessionDefaultsArgs, type ResolvedSessionDefaults, type SessionDefaultsOverrides, resolveSessionDefaults };

package/dist/core/sessions/index.d.ts

@@ -0,0 +1,79 @@
+import { M as ModelConfigInput, R as ResolvedModelConfig } from '../resolve-config-BcL-Hv8k.js';
+import { c as AgenticToolName, g as CodexSandboxMode, d as CodexApprovalPolicy, e as CodexNetworkAccess } from '../agentic-tool-cYqsU5i5.js';
+import { P as PermissionMode, a as Session } from '../session-CAfhv1qL.js';
+import { q as User } from '../user-DP-XZMIM.js';
+import '../id-CoIbY_uc.js';
+import '../context-BpkCELpO.js';
+
+/**
+ * Session creation config resolution
+ *
+ * Single source of truth for "given a user (and optional overrides), what
+ * permission_config / model_config / mcp_server_ids should this new session
+ * be stamped with?"
+ *
+ * This collapses the resolution dance that was duplicated across:
+ * - `apps/agor-daemon/src/mcp/tools/sessions.ts`   (`agor_sessions_create`)
+ * - `apps/agor-daemon/src/mcp/tools/worktrees.ts`  (`agor_worktrees_set_zone`)
+ * - `apps/agor-daemon/src/services/gateway.ts`     (gateway session creation)
+ * - `apps/agor-daemon/src/services/sessions.ts`    (cross-tool spawn fallback)
+ * - `apps/agor-daemon/src/utils/apply-session-config-defaults.ts` (the
+ *   `before:create` hook, which applies these defaults to ANY caller — UI
+ *   drag-into-zone, raw REST, etc. — that omits permission/model config)
+ *
+ * Resolution order (highest priority first):
+ *   1. `overrides.*`         — explicit caller intent
+ *   2. `user.default_agentic_config[tool].*`  — user's saved default for this tool
+ *   3. Hardcoded `getDefaultPermissionMode(tool)` (permission only) /
+ *      `undefined` (model)
+ *
+ * MCP server inheritance (separate axis):
+ *   1. `overrides.mcpServerIds`  — explicit (incl. empty array = "no MCPs")
+ *   2. `worktree.mcp_server_ids` — worktree-level override
+ *   3. `user.default_agentic_config[tool].mcpServerIds`
+ *   4. `[]`
+ */
+
+/** Explicit per-call overrides. Each field, when defined, wins over user defaults. */
+interface SessionDefaultsOverrides {
+    permissionMode?: PermissionMode;
+    modelConfig?: ModelConfigInput;
+    codexSandboxMode?: CodexSandboxMode;
+    codexApprovalPolicy?: CodexApprovalPolicy;
+    codexNetworkAccess?: CodexNetworkAccess;
+    /**
+     * Explicit MCP server ID list. An empty array means "no MCPs" — does NOT
+     * fall through to worktree/user defaults. Pass `undefined` to fall through.
+     */
+    mcpServerIds?: string[];
+}
+interface ResolveSessionDefaultsArgs {
+    agenticTool: AgenticToolName;
+    /** User whose `default_agentic_config[tool]` provides the next-priority defaults. */
+    user?: Pick<User, 'default_agentic_config'> | null;
+    /** Optional worktree for MCP server inheritance (worktree-level overrides user defaults). */
+    worktree?: {
+        mcp_server_ids?: string[] | null;
+    } | null;
+    overrides?: SessionDefaultsOverrides;
+    /** Override `new Date()` for deterministic tests. */
+    now?: Date;
+}
+interface ResolvedSessionDefaults {
+    /** Always populated — falls back to `getDefaultPermissionMode(tool)` mapped through `mapPermissionMode`. */
+    permission_config: NonNullable<Session['permission_config']>;
+    /** Optional — `undefined` when neither overrides nor user defaults specify a model. */
+    model_config?: ResolvedModelConfig;
+    /** Resolved MCP server list. Empty array means "no MCPs". */
+    mcp_server_ids: string[];
+}
+/**
+ * Resolve session creation defaults from caller overrides + user defaults.
+ *
+ * The returned `permission_config` is always populated (using the system
+ * fallback when nothing else applies), so callers can persist it directly.
+ * `model_config` may be `undefined` when no model has been chosen anywhere.
+ */
+declare function resolveSessionDefaults(args: ResolveSessionDefaultsArgs): ResolvedSessionDefaults;
+
+export { type ResolveSessionDefaultsArgs, type ResolvedSessionDefaults, type SessionDefaultsOverrides, resolveSessionDefaults };

package/dist/core/sessions/index.js

@@ -0,0 +1,157 @@
+// src/models/resolve-config.ts
+function resolveModelConfig(input, opts) {
+  if (!input?.model) return void 0;
+  return {
+    mode: input.mode ?? "alias",
+    model: input.model,
+    updated_at: (opts?.now ?? /* @__PURE__ */ new Date()).toISOString(),
+    ...input.effort !== void 0 && { effort: input.effort },
+    ...input.provider !== void 0 && { provider: input.provider }
+  };
+}
+
+// src/types/session.ts
+function getDefaultPermissionMode(agenticTool) {
+  switch (agenticTool) {
+    case "gemini":
+      return "autoEdit";
+    // Native Gemini SDK mode
+    case "codex":
+      return "auto";
+    // Native Codex SDK mode
+    case "opencode":
+      return "autoEdit";
+    // OpenCode auto-approves, similar to Gemini
+    case "copilot":
+      return "acceptEdits";
+    // Copilot uses same semantics as Claude Code
+    default:
+      return "acceptEdits";
+  }
+}
+
+// src/utils/permission-mode-mapper.ts
+function mapPermissionMode(mode, agenticTool) {
+  switch (agenticTool) {
+    case "claude-code":
+    case "copilot":
+      switch (mode) {
+        // Native Claude modes - pass through
+        case "default":
+        case "acceptEdits":
+        case "bypassPermissions":
+        case "plan":
+        case "dontAsk":
+          return mode;
+        // Gemini modes → Claude equivalents
+        case "autoEdit":
+          return "acceptEdits";
+        case "yolo":
+          return "bypassPermissions";
+        // Codex modes → Claude equivalents
+        case "ask":
+          return "default";
+        case "auto":
+          return "acceptEdits";
+        case "on-failure":
+          return "acceptEdits";
+        case "allow-all":
+          return "bypassPermissions";
+        default:
+          return "acceptEdits";
+      }
+    case "gemini":
+    case "opencode":
+      switch (mode) {
+        // Native Gemini modes - pass through
+        case "default":
+        case "autoEdit":
+        case "yolo":
+          return mode;
+        // Claude modes → Gemini equivalents
+        case "acceptEdits":
+          return "autoEdit";
+        case "bypassPermissions":
+        case "dontAsk":
+          return "yolo";
+        case "plan":
+          return "default";
+        // Plan mode → restrictive
+        // Codex modes → Gemini equivalents
+        case "ask":
+          return "default";
+        case "auto":
+          return "autoEdit";
+        case "on-failure":
+          return "autoEdit";
+        case "allow-all":
+          return "yolo";
+        default:
+          return "autoEdit";
+      }
+    case "codex":
+      switch (mode) {
+        // Native Codex modes - pass through
+        case "ask":
+        case "auto":
+        case "on-failure":
+        case "allow-all":
+          return mode;
+        // Claude modes → Codex equivalents
+        case "default":
+          return "ask";
+        case "acceptEdits":
+          return "auto";
+        case "bypassPermissions":
+        case "dontAsk":
+          return "allow-all";
+        case "plan":
+          return "ask";
+        // Gemini modes → Codex equivalents
+        case "autoEdit":
+          return "auto";
+        case "yolo":
+          return "allow-all";
+        default:
+          return "auto";
+      }
+    default:
+      return mode;
+  }
+}
+
+// src/sessions/resolve-session-defaults.ts
+function resolveSessionDefaults(args) {
+  const { agenticTool, user, worktree, overrides, now } = args;
+  const userToolDefaults = user?.default_agentic_config?.[agenticTool];
+  const requestedMode = overrides?.permissionMode ?? userToolDefaults?.permissionMode ?? getDefaultPermissionMode(agenticTool);
+  const permissionMode = mapPermissionMode(requestedMode, agenticTool);
+  const permission_config = {
+    mode: permissionMode
+  };
+  if (agenticTool === "codex") {
+    const sandboxMode = overrides?.codexSandboxMode ?? userToolDefaults?.codexSandboxMode;
+    const approvalPolicy = overrides?.codexApprovalPolicy ?? userToolDefaults?.codexApprovalPolicy;
+    const networkAccess = overrides?.codexNetworkAccess ?? userToolDefaults?.codexNetworkAccess;
+    if (sandboxMode && approvalPolicy) {
+      permission_config.codex = {
+        sandboxMode,
+        approvalPolicy,
+        ...networkAccess !== void 0 && { networkAccess }
+      };
+    }
+  }
+  const model_config = resolveModelConfig(overrides?.modelConfig, { now }) ?? resolveModelConfig(userToolDefaults?.modelConfig, { now });
+  let mcp_server_ids;
+  if (overrides?.mcpServerIds !== void 0) {
+    mcp_server_ids = overrides.mcpServerIds;
+  } else if (worktree?.mcp_server_ids && worktree.mcp_server_ids.length > 0) {
+    mcp_server_ids = worktree.mcp_server_ids;
+  } else {
+    mcp_server_ids = userToolDefaults?.mcpServerIds ?? [];
+  }
+  return { permission_config, model_config, mcp_server_ids };
+}
+export {
+  resolveSessionDefaults
+};

package/dist/core/{task-BLPFCORT.d.ts → task-BHV-YHg1.d.ts}

@@ -1,4 +1,5 @@
 import { T as TaskID, S as SessionID } from './id-CoIbY_uc.js';
+import { f as MessageSource } from './message-DZa8g0s0.js';
 import { b as ContextFilePath } from './context-BpkCELpO.js';
 
 /**
@@ -57,6 +58,7 @@ interface Report {
 }
 
 declare const TaskStatus: {
+    readonly QUEUED: "queued";
     readonly CREATED: "created";
     readonly RUNNING: "running";
     readonly STOPPING: "stopping";
@@ -68,6 +70,31 @@ declare const TaskStatus: {
     readonly STOPPED: "stopped";
 };
 type TaskStatus = (typeof TaskStatus)[keyof typeof TaskStatus];
+/**
+ * Structured metadata attached to a task. All fields are optional, but the
+ * ones that are present are load-bearing — typing them here prevents drift
+ * between the daemon (which writes them) and the UI/services that read them.
+ *
+ * - `is_agor_callback`: marks a task whose prompt was synthesized by the
+ *   callback machinery (child session finished → parent gets a system
+ *   message). Drives both auth attribution and UI styling.
+ * - `source`: where the prompt entered the system. Copied onto the
+ *   user-message row so message-level provenance survives the queue → run
+ *   transition.
+ * - `queued_by_user_id`: who scheduled the task (distinct from
+ *   `task.created_by` for callback tasks, where `created_by` is the
+ *   callback owner and `queued_by_user_id` is set to the same value but
+ *   the field carries semantic intent rather than ownership).
+ * - `child_session_id` / `child_task_id`: lineage breadcrumbs for callback
+ *   tasks — the child session/task whose completion produced this prompt.
+ */
+interface TaskMetadata {
+    is_agor_callback?: boolean;
+    source?: MessageSource;
+    queued_by_user_id?: string;
+    child_session_id?: SessionID;
+    child_task_id?: TaskID;
+}
 /**
  * A task reached a terminal state *on its own* (finished or hit an error),
  * as opposed to being user-stopped/timed-out/cancelled. Used e.g. to gate
@@ -83,9 +110,20 @@ interface Task {
     created_by: string;
     /** Original user prompt (can be multi-line) */
     full_prompt: string;
-    /** Optional: LLM-generated short summary */
-    description?: string;
     status: TaskStatus;
+    /**
+     * Queue position when status is QUEUED. Lower values drain first.
+     * Undefined for non-queued tasks.
+     */
+    queue_position?: number;
+    /**
+     * Structured metadata for the task. Fields here are load-bearing for
+     * auth, lineage, and UI styling — see the per-field comments. When a
+     * QUEUED task transitions to RUNNING and a user-message row is written,
+     * `is_agor_callback` and `source` are copied onto the new message.metadata
+     * so the UI styling for callbacks survives the queue → run hop.
+     */
+    metadata?: TaskMetadata;
     message_range: {
         start_index: number;
         end_index: number;
@@ -153,4 +191,4 @@ interface Task {
     completed_at?: string;
 }
 
-export { type Report as R, type Task as T, type ReportPath as a, type ReportTemplate as b, TaskStatus as c, isNaturalCompletion as i };
+export { type Report as R, type Task as T, type ReportPath as a, type ReportTemplate as b, type TaskMetadata as c, TaskStatus as d, isNaturalCompletion as i };

package/dist/core/{task-wht1RJEL.d.cts → task-C2Hy7H6u.d.cts}

@@ -1,4 +1,5 @@
 import { T as TaskID, S as SessionID } from './id-CoIbY_uc.cjs';
+import { f as MessageSource } from './message-CSWOsdcZ.cjs';
 import { b as ContextFilePath } from './context-BpkCELpO.cjs';
 
 /**
@@ -57,6 +58,7 @@ interface Report {
 }
 
 declare const TaskStatus: {
+    readonly QUEUED: "queued";
     readonly CREATED: "created";
     readonly RUNNING: "running";
     readonly STOPPING: "stopping";
@@ -68,6 +70,31 @@ declare const TaskStatus: {
     readonly STOPPED: "stopped";
 };
 type TaskStatus = (typeof TaskStatus)[keyof typeof TaskStatus];
+/**
+ * Structured metadata attached to a task. All fields are optional, but the
+ * ones that are present are load-bearing — typing them here prevents drift
+ * between the daemon (which writes them) and the UI/services that read them.
+ *
+ * - `is_agor_callback`: marks a task whose prompt was synthesized by the
+ *   callback machinery (child session finished → parent gets a system
+ *   message). Drives both auth attribution and UI styling.
+ * - `source`: where the prompt entered the system. Copied onto the
+ *   user-message row so message-level provenance survives the queue → run
+ *   transition.
+ * - `queued_by_user_id`: who scheduled the task (distinct from
+ *   `task.created_by` for callback tasks, where `created_by` is the
+ *   callback owner and `queued_by_user_id` is set to the same value but
+ *   the field carries semantic intent rather than ownership).
+ * - `child_session_id` / `child_task_id`: lineage breadcrumbs for callback
+ *   tasks — the child session/task whose completion produced this prompt.
+ */
+interface TaskMetadata {
+    is_agor_callback?: boolean;
+    source?: MessageSource;
+    queued_by_user_id?: string;
+    child_session_id?: SessionID;
+    child_task_id?: TaskID;
+}
 /**
  * A task reached a terminal state *on its own* (finished or hit an error),
  * as opposed to being user-stopped/timed-out/cancelled. Used e.g. to gate
@@ -83,9 +110,20 @@ interface Task {
     created_by: string;
     /** Original user prompt (can be multi-line) */
     full_prompt: string;
-    /** Optional: LLM-generated short summary */
-    description?: string;
     status: TaskStatus;
+    /**
+     * Queue position when status is QUEUED. Lower values drain first.
+     * Undefined for non-queued tasks.
+     */
+    queue_position?: number;
+    /**
+     * Structured metadata for the task. Fields here are load-bearing for
+     * auth, lineage, and UI styling — see the per-field comments. When a
+     * QUEUED task transitions to RUNNING and a user-message row is written,
+     * `is_agor_callback` and `source` are copied onto the new message.metadata
+     * so the UI styling for callbacks survives the queue → run hop.
+     */
+    metadata?: TaskMetadata;
     message_range: {
         start_index: number;
         end_index: number;
@@ -153,4 +191,4 @@ interface Task {
     completed_at?: string;
 }
 
-export { type Report as R, type Task as T, type ReportPath as a, type ReportTemplate as b, TaskStatus as c, isNaturalCompletion as i };
+export { type Report as R, type Task as T, type ReportPath as a, type ReportTemplate as b, type TaskMetadata as c, TaskStatus as d, isNaturalCompletion as i };

package/dist/core/templates/session-context.d.cts

@@ -1,7 +1,7 @@
 import { S as SessionID, W as WorktreeID, e as UUID } from '../id-CoIbY_uc.cjs';
 import { h as Worktree, R as Repo } from '../repo-Ckl-vaAk.cjs';
 import { a as Session } from '../session-MNU4BQv4.cjs';
-import { g as User } from '../user-DkNdeFoz.cjs';
+import { q as User } from '../user-CpfkcV2C.cjs';
 import '../agentic-tool-BulhIUGb.cjs';
 import '../context-BpkCELpO.cjs';
 

package/dist/core/templates/session-context.d.ts

@@ -1,7 +1,7 @@
 import { S as SessionID, W as WorktreeID, e as UUID } from '../id-CoIbY_uc.js';
 import { h as Worktree, R as Repo } from '../repo-84E0A2gV.js';
 import { a as Session } from '../session-CAfhv1qL.js';
-import { g as User } from '../user-BfVWBmXA.js';
+import { q as User } from '../user-DP-XZMIM.js';
 import '../agentic-tool-cYqsU5i5.js';
 import '../context-BpkCELpO.js';