@agent-native/core 0.219.0 → 0.220.0-nightly-20261023212848

package/dist/notifications/routes.d.ts

@@ -16,6 +16,6 @@ export declare function createNotificationsHandler(): import("h3").EventHandlerW
 } | {
     count?: undefined;
     updated?: undefined;
-    error?: undefined;
     ok: boolean;
+    error?: undefined;
 }>>;

package/dist/observability/routes.d.ts

@@ -27,43 +27,43 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     thumbsUpRate: number;
     avgEvalScore: number;
 } | {
-    ok?: undefined;
     error: string;
     message: string;
     summary?: undefined;
     spans?: undefined;
-} | {
-    error?: undefined;
     ok?: undefined;
+} | {
     message?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
-} | {
     error?: undefined;
     ok?: undefined;
+} | {
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     traceMissing: true;
     id: string;
-} | {
     error?: undefined;
     ok?: undefined;
+} | {
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     traceMissing?: undefined;
     id: string;
-} | {
+    error?: undefined;
     ok?: undefined;
+} | {
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
     error: any;
+    ok?: undefined;
 } | {
-    error?: undefined;
     message?: undefined;
     summary?: undefined;
     spans?: undefined;
+    error?: undefined;
     ok: boolean;
 }>>;

package/dist/observability/traces.d.ts

@@ -37,6 +37,8 @@ export declare function instrumentAgentLoop(opts: {
     };
     runId: string;
     threadId: string | null;
+    /** The agent turn this run serves; omitted from events when unknown. */
+    turnId?: string;
     userId: string | null;
     config: ObservabilityConfig;
     spanName?: string;

package/dist/observability/traces.js

@@ -211,6 +211,7 @@ function emitLlmGenerationTrackingEvent(args) {
         span_type: "llm_call",
         run_id: args.runId,
         thread_id: args.threadId,
+        turn_id: args.turnId,
         parent_span_id: args.parentSpanId,
         span_id: args.llmSpanId,
         model: args.model,
@@ -357,7 +358,7 @@ export async function getObservabilityConfig() {
     return { ...config, ...resolveInferredSentimentConfig(config) };
 }
 export async function instrumentAgentLoop(opts) {
-    const { runAgentLoop, loopOpts, runId, threadId, userId, config } = opts;
+    const { runAgentLoop, loopOpts, runId, threadId, turnId, userId, config } = opts;
     const engineName = typeof loopOpts.engine?.name === "string"
         ? loopOpts.engine.name
         : undefined;
@@ -752,8 +753,13 @@ export async function instrumentAgentLoop(opts) {
                         error_class: !isError
                             ? null
                             : explicitError
-                                ? "tool_error"
+                                ? (event.errorClass ?? "tool_error")
                                 : "legacy_inferred_error",
+                        outcome: event.outcomeUnknown
+                            ? "unknown"
+                            : event.completedSideEffect === true
+                                ? "completed"
+                                : "no_side_effect",
                     });
                 }
                 recordAgentToolCall({
@@ -927,6 +933,7 @@ export async function instrumentAgentLoop(opts) {
                             duration_ms: Math.max(0, runEnd - pending.startMs),
                             status: "error",
                             error_class: "interrupted",
+                            outcome: "unknown",
                         });
                     }
                     if (pending.otelSpan) {
@@ -1149,6 +1156,7 @@ export async function instrumentAgentLoop(opts) {
                     emitLlmGenerationTrackingEvent({
                         runId,
                         threadId,
+                        turnId,
                         userId,
                         parentSpanId,
                         llmSpanId: generation.spanId,
@@ -1263,6 +1271,7 @@ export async function instrumentAgentLoop(opts) {
                         source: "agent_observability",
                         run_id: runId,
                         thread_id: threadId,
+                        turn_id: turnId,
                         llm_calls: llmCallCount || undefined,
                         follow_up_ms: usage?.followUpMs,
                         follow_up_input_tokens: usage?.followUpInputTokens,

package/dist/provider-api/actions/custom-provider-registration.d.ts

@@ -75,10 +75,9 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         user: "user";
     }>>;
 }, z.core.$strip>>, {
-    message?: undefined;
     id?: undefined;
-    provider?: undefined;
-    deleted?: undefined;
+    message?: undefined;
+    found?: undefined;
     providers: {
         id: string;
         label: string;
@@ -89,45 +88,46 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         updatedAt: number;
     }[];
     count: number;
-    found?: undefined;
+    provider?: undefined;
+    deleted?: undefined;
     registered?: undefined;
     label?: undefined;
 } | {
-    message?: undefined;
     id?: undefined;
-    count?: undefined;
-    deleted?: undefined;
+    message?: undefined;
     providers?: undefined;
+    count?: undefined;
     found: boolean;
     provider: import("../custom-registry.js").CustomProviderConfig;
+    deleted?: undefined;
     registered?: undefined;
     label?: undefined;
 } | {
     message?: undefined;
-    provider?: undefined;
-    count?: undefined;
-    deleted?: undefined;
     providers?: undefined;
+    count?: undefined;
+    provider?: undefined;
     found: boolean;
     id: string;
+    deleted?: undefined;
     registered?: undefined;
     label?: undefined;
 } | {
     message?: undefined;
-    provider?: undefined;
-    count?: undefined;
-    providers?: undefined;
     found?: undefined;
+    providers?: undefined;
+    count?: undefined;
+    provider?: undefined;
     deleted: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
 } | {
-    provider?: undefined;
+    found?: undefined;
+    providers?: undefined;
     count?: undefined;
+    provider?: undefined;
     deleted?: undefined;
-    providers?: undefined;
-    found?: undefined;
     registered: boolean;
     id: string;
     label: string;

package/dist/provider-api/actions/provider-api.d.ts

@@ -316,9 +316,8 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         notes?: string | undefined;
         scope?: "org" | "user" | undefined;
     }, {
-        id?: undefined;
+        found?: undefined;
         deleted?: undefined;
-        provider?: undefined;
         providers: {
             id: string;
             label: string;
@@ -329,46 +328,47 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
             updatedAt: number;
         }[];
         count: number;
-        found?: undefined;
+        provider?: undefined;
         registered?: undefined;
+        id?: undefined;
         label?: undefined;
         message?: undefined;
     } | {
-        id?: undefined;
         deleted?: undefined;
-        count?: undefined;
         providers?: undefined;
+        count?: undefined;
         found: boolean;
         provider: import("../custom-registry.js").CustomProviderConfig;
         registered?: undefined;
+        id?: undefined;
         label?: undefined;
         message?: undefined;
     } | {
         deleted?: undefined;
-        provider?: undefined;
-        count?: undefined;
         providers?: undefined;
+        count?: undefined;
+        provider?: undefined;
         found: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
         message?: undefined;
     } | {
-        provider?: undefined;
-        count?: undefined;
-        providers?: undefined;
         found?: undefined;
+        providers?: undefined;
+        count?: undefined;
+        provider?: undefined;
         deleted: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
         message?: undefined;
     } | {
+        found?: undefined;
         deleted?: undefined;
-        provider?: undefined;
-        count?: undefined;
         providers?: undefined;
-        found?: undefined;
+        count?: undefined;
+        provider?: undefined;
         registered: boolean;
         id: string;
         label: string;

package/dist/provider-api/corpus-jobs.d.ts

@@ -73,7 +73,6 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     offset?: unknown;
     limit?: unknown;
 }, {
-    deleted?: undefined;
     jobs: {
         id: string;
         name: string;
@@ -84,6 +83,7 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
         updatedAt: string;
     }[];
     total: number;
+    deleted?: undefined;
     jobId?: undefined;
 } | {
     jobs?: undefined;
@@ -91,9 +91,9 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     deleted: boolean;
     jobId: string;
 } | {
-    deleted?: undefined;
     jobs?: undefined;
     total?: undefined;
+    deleted?: undefined;
     jobId?: undefined;
     hits: Record<string, unknown>[];
     offset: number;

package/dist/resources/handlers.d.ts

@@ -39,8 +39,8 @@ export declare function handleUpdateResource(event: any): Promise<import("./stor
     error: string;
 }>;
 export declare function handleDeleteResource(event: any): Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/review/index.d.ts

@@ -6,6 +6,6 @@ export { __resetReviewableResourcesForTests, assertReviewableResourceAccess, get
 export { __resetReviewInitForTests, ensureReviewTables, getReviewCommentById, getReviewStatus, getReviewThreadSummary, getReviewThreadRoot, queryReviewComments, routeReviewThread, sendReviewThreadToAgent, } from "./store.js";
 export * from "./suggestions/types.js";
 export { registerSuggestionAdapter, getSuggestionAdapter, listSuggestionAdapters, __resetSuggestionAdaptersForTests, } from "./suggestions/registry.js";
-export { ensureSuggestionTables, getDecision, getSuggestion, getSuggestionByCreationKey, listSuggestions, __resetSuggestionTablesForTests, } from "./suggestions/store.js";
+export { ensureSuggestionTables, getDecision, getSuggestion, getSuggestionByCreationKey, listSuggestions, rebaseSuggestion, __resetSuggestionTablesForTests, } from "./suggestions/store.js";
 export { suggestionActorKind, suggestionActorKindMatchesReceipt, } from "./suggestions/actor-kind.js";
 export type { GetReviewThreadSummaryInput, ReviewThreadSummary, } from "./store.js";

package/dist/review/index.js

@@ -5,5 +5,5 @@ export { __resetReviewableResourcesForTests, assertReviewableResourceAccess, get
 export { __resetReviewInitForTests, ensureReviewTables, getReviewCommentById, getReviewStatus, getReviewThreadSummary, getReviewThreadRoot, queryReviewComments, routeReviewThread, sendReviewThreadToAgent, } from "./store.js";
 export * from "./suggestions/types.js";
 export { registerSuggestionAdapter, getSuggestionAdapter, listSuggestionAdapters, __resetSuggestionAdaptersForTests, } from "./suggestions/registry.js";
-export { ensureSuggestionTables, getDecision, getSuggestion, getSuggestionByCreationKey, listSuggestions, __resetSuggestionTablesForTests, } from "./suggestions/store.js";
+export { ensureSuggestionTables, getDecision, getSuggestion, getSuggestionByCreationKey, listSuggestions, rebaseSuggestion, __resetSuggestionTablesForTests, } from "./suggestions/store.js";
 export { suggestionActorKind, suggestionActorKindMatchesReceipt, } from "./suggestions/actor-kind.js";

package/dist/review/suggestions/actions.js

@@ -435,7 +435,7 @@ export const decideResourceSuggestion = defineAction({
             }
             return { suggestion: latest, decision };
         };
-        const decide = (coordination) => db.transaction(async (tx) => {
+        const decideIn = async (tx, coordination) => {
             const current = await getSuggestion(args.id, tx);
             if (!current)
                 throw new Error("Suggestion not found");
@@ -450,8 +450,7 @@ export const decideResourceSuggestion = defineAction({
                     errorCode: "suggestion_conflict",
                 });
             }
-            if (!currentAdapter ||
-                currentAdapter.version !== current.adapterVersion)
+            if (!currentAdapter || currentAdapter.version !== current.adapterVersion)
                 throw new Error("Suggestion adapter version is unavailable");
             // Withdrawing never applies the suggestion, so a base that moved on
             // since the author last saw it is no conflict.
@@ -508,11 +507,14 @@ export const decideResourceSuggestion = defineAction({
                     resourceId: current.resourceId,
                 }, args.decision);
             }
-            return {
-                suggestion: await getSuggestion(current.id, tx),
-                decision: prior.record,
-            };
-        });
+            const decided = await getSuggestion(current.id, tx);
+            if (!decided)
+                throw new Error("Decided suggestion disappeared");
+            return { suggestion: decided, decision: prior.record };
+        };
+        const decide = (coordination, options = {}) => options.transaction
+            ? decideIn(options.transaction, coordination)
+            : db.transaction((tx) => decideIn(tx, coordination));
         if (args.decision === "accepted" && adapter.coordinateDecision) {
             return adapter.coordinateDecision({
                 resourceType: suggestion.resourceType,
@@ -842,7 +844,7 @@ export const decideResourceSuggestionProposal = defineAction({
                 suggestions: suggestions,
             };
         };
-        const decide = (coordination) => db.transaction(async (tx) => {
+        const decideIn = async (tx, coordination) => {
             const currentProposal = await getSuggestionProposal(tx, args.proposalId);
             if (!currentProposal)
                 fail("Proposal not found", {
@@ -936,15 +938,20 @@ export const decideResourceSuggestionProposal = defineAction({
                 proposal: currentProposal,
                 suggestions: decided,
             };
-        }).catch(async (error) => {
-            const prior = await getProposalDecision(db, args.idempotencyKey);
-            if (!prior)
-                throw error;
-            return db.transaction(async (tx) => {
-                await assertReviewableResourceAccess(proposal.resourceType, proposal.resourceId, { ...ctx, transaction: tx }, "editor");
-                return replayDecision(tx, prior);
+        };
+        // A failure in the adapter's transaction aborts it, so the receipt of a
+        // decision that won meanwhile can't be read here; the adapter replays.
+        const decide = (coordination, options = {}) => options.transaction
+            ? decideIn(options.transaction, coordination)
+            : db.transaction((tx) => decideIn(tx, coordination)).catch(async (error) => {
+                const prior = await getProposalDecision(db, args.idempotencyKey);
+                if (!prior)
+                    throw error;
+                return db.transaction(async (tx) => {
+                    await assertReviewableResourceAccess(proposal.resourceType, proposal.resourceId, { ...ctx, transaction: tx }, "editor");
+                    return replayDecision(tx, prior);
+                });
             });
-        });
         if (args.decision === "accepted" && adapter.coordinateDecision) {
             return adapter.coordinateDecision({
                 resourceType: proposal.resourceType,
@@ -953,6 +960,7 @@ export const decideResourceSuggestionProposal = defineAction({
                 operations: initial.operations,
                 decision: args.decision,
                 proposalDecision: true,
+                proposalMemberIds: members.map((member) => member.id),
                 access,
                 ctx: { ...ctx, suggestionAccess: access },
             }, decide);

package/dist/review/suggestions/store.d.ts

@@ -20,7 +20,20 @@ export declare function getSuggestionAmendment(client: DbExec, key: string): Pro
     request: string;
     suggestion: ResourceSuggestion;
 }>;
-export declare function amendSuggestion(client: DbExec, before: ResourceSuggestion, operations: SuggestionOperation[], summary: string, idempotencyKey: string, request: string): Promise<ResourceSuggestion | null>;
+export declare function amendSuggestion(client: DbExec, before: ResourceSuggestion, operations: SuggestionOperation[], summary: string, idempotencyKey: string, request: string, baseRevision?: string): Promise<ResourceSuggestion | null>;
+/**
+ * Moves a pending suggestion onto `baseRevision` with `operations` that make
+ * the same change there, as when its resource was rewritten into an
+ * equivalent form. It is recorded as an amendment, so the suggestion's
+ * revision moves and anyone holding the old one refreshes before deciding.
+ * Null when the suggestion was decided or changed since `before` was read.
+ */
+export declare function rebaseSuggestion(client: DbExec, before: ResourceSuggestion, input: {
+    operations: SuggestionOperation[];
+    baseRevision: string;
+    idempotencyKey: string;
+    reason: string;
+}): Promise<ResourceSuggestion | null>;
 export declare function getSuggestion(suggestionId: string, client?: DbExec): Promise<ResourceSuggestion | null>;
 /** Loads several suggestions in two queries; missing ids come back as null. */
 export declare function getSuggestions(suggestionIds: readonly string[], client?: DbExec): Promise<(ResourceSuggestion | null)[]>;

package/dist/review/suggestions/store.js

@@ -205,11 +205,11 @@ export async function getSuggestionAmendment(client, key) {
         }
         : null;
 }
-export async function amendSuggestion(client, before, operations, summary, idempotencyKey, request) {
+export async function amendSuggestion(client, before, operations, summary, idempotencyKey, request, baseRevision = before.baseRevision) {
     const now = new Date().toISOString();
     const claimed = await client.execute({
-        sql: "UPDATE agent_review_suggestions SET revision = revision + 1, summary = ?, updated_at = ? WHERE id = ? AND status = 'pending' AND revision = ?",
-        args: [summary, now, before.id, before.revision],
+        sql: "UPDATE agent_review_suggestions SET revision = revision + 1, summary = ?, base_revision = ?, updated_at = ? WHERE id = ? AND status = 'pending' AND revision = ?",
+        args: [summary, baseRevision, now, before.id, before.revision],
     });
     if (claimed.rowsAffected !== 1)
         return null;
@@ -239,6 +239,19 @@ export async function amendSuggestion(client, before, operations, summary, idemp
     });
     return after;
 }
+/**
+ * Moves a pending suggestion onto `baseRevision` with `operations` that make
+ * the same change there, as when its resource was rewritten into an
+ * equivalent form. It is recorded as an amendment, so the suggestion's
+ * revision moves and anyone holding the old one refreshes before deciding.
+ * Null when the suggestion was decided or changed since `before` was read.
+ */
+export function rebaseSuggestion(client, before, input) {
+    return amendSuggestion(client, before, input.operations, before.summary, input.idempotencyKey, JSON.stringify({
+        rebase: input.reason,
+        baseRevision: input.baseRevision,
+    }), input.baseRevision);
+}
 export async function getSuggestion(suggestionId, client = getDbExec()) {
     await ensureSuggestionTables(client);
     const row = (await client.execute({

package/dist/review/suggestions/types.d.ts

@@ -68,9 +68,23 @@ export interface SuggestionDecisionContext {
     operations: SuggestionOperation[];
     decision: SuggestionDecision;
     proposalDecision?: boolean;
+    /**
+     * The members a proposal decision decides, in the order it calls `apply`
+     * for them. `suggestion` is the first.
+     */
+    proposalMemberIds?: string[];
     access: SuggestionAccess;
     ctx?: Record<string, unknown>;
 }
+export interface SuggestionDecisionRunOptions {
+    /**
+     * Runs the decision in this transaction instead of its own, so the
+     * decision commits or rolls back with the adapter's write. A decision that
+     * replays an earlier one returns without calling `apply`; an adapter whose
+     * write must not commit without the decision has to check for that.
+     */
+    transaction?: unknown;
+}
 export interface SuggestionAdapter {
     kind: string;
     version: number;
@@ -83,7 +97,7 @@ export interface SuggestionAdapter {
         ctx?: Record<string, unknown>;
     }): Promise<void | SuggestionOperation[]> | void | SuggestionOperation[];
     preview?(context: SuggestionContext): Promise<unknown> | unknown;
-    coordinateDecision?<T>(context: SuggestionDecisionContext, run: (coordination?: unknown) => Promise<T>): Promise<T>;
+    coordinateDecision?<T>(context: SuggestionDecisionContext, run: (coordination?: unknown, options?: SuggestionDecisionRunOptions) => Promise<T>): Promise<T>;
     finalizeProposalDecision?(context: {
         resourceType: string;
         resourceId: string;

package/dist/scripts/chat/search-chats.js

@@ -31,6 +31,7 @@ Options:
   --limit N            Max results (default: 20)
   --format json        Output as JSON
   --includeArchived    Also include archived chats (excluded by default)
+  --includeHidden      Also include chats hidden by you (excluded by default)
   --help               Show this help message
 
 Examples:
@@ -45,10 +46,19 @@ Examples:
     if (isNaN(limit) || limit < 1)
         fail("--limit must be a positive integer");
     const includeArchived = parsed.includeArchived === "true";
+    const includeHidden = parsed.includeHidden === "true";
     const query = parsed.query;
     const threads = query
-        ? await searchThreads(owner, query, limit, { includeArchived })
-        : await listThreads(owner, { limit, offset: 0, includeArchived });
+        ? await searchThreads(owner, query, limit, {
+            includeArchived,
+            includeHidden,
+        })
+        : await listThreads(owner, {
+            limit,
+            offset: 0,
+            includeArchived,
+            includeHidden,
+        });
     if (parsed.format === "json") {
         console.log(JSON.stringify({
             query: query ?? null,
@@ -60,6 +70,7 @@ Examples:
                 updatedAt: t.updatedAt,
                 pinnedAt: t.pinnedAt ?? null,
                 archivedAt: t.archivedAt ?? null,
+                hiddenAt: t.hiddenAt ?? null,
             })),
             count: threads.length,
         }, null, 2));
@@ -80,6 +91,7 @@ Examples:
         const flags = [
             t.pinnedAt ? "pinned" : null,
             t.archivedAt ? "archived" : null,
+            t.hiddenAt ? "hidden" : null,
         ].filter(Boolean);
         console.log(`  ${title}`);
         console.log(`    ID: ${t.id}  |  ${msgs}  |  ${time}${flags.length ? `  |  ${flags.join(", ")}` : ""}`);

package/dist/server/agent-chat/browser-team-tools.js

@@ -1,9 +1,11 @@
 import { createHash } from "node:crypto";
+import { setTimeout as delay } from "node:timers/promises";
 import { ACTION_CHAT_UI_AGENT_TEAM_PROGRESS_RENDERER, normalizeAgentTeamProgressResult, } from "../../action-ui.js";
+import { fail } from "../../action.js";
 import { getActiveFileUploadProviderForRequest } from "../../file-upload/registry.js";
 import { areBuiltinMcpCapabilitiesSupported, setBuiltinMcpCapabilityEnabled, } from "../../mcp-client/index.js";
 import { getBuilderBrowserConnectUrlForOwner, resolveBuilderBranchProjectId, } from "../builder-browser.js";
-import { getRequestUserEmail } from "../request-context.js";
+import { getRequestOrgId, getRequestUserEmail } from "../request-context.js";
 import { getMcpManagerForCurrentRequest } from "./mcp-glue.js";
 const MAX_EXTENSION_PROMOTION_CONTENT_CHARS = 200_000;
 const MAX_AGENT_TEAM_PROGRESS_TASKS = 3;
@@ -367,8 +369,35 @@ export function createBuilderBrowserTool(deps) {
     return entries;
 }
 export function createTeamTools(deps) {
+    const readTask = async (taskId, waitMs, context) => {
+        if (!Number.isInteger(waitMs) || waitMs < 0 || waitMs > 20_000)
+            fail("waitMs must be an integer between 0 and 20000.", {
+                errorCode: "invalid_input",
+                statusCode: 422,
+            });
+        const scope = {
+            ownerEmail: deps.getOwner(),
+            orgId: context?.orgId !== undefined
+                ? context.orgId
+                : (getRequestOrgId() ?? null),
+        };
+        const signal = context?.signal;
+        signal?.throwIfAborted();
+        const { getTask } = await import("../agent-teams.js");
+        const deadline = Date.now() + waitMs;
+        let task = await getTask(taskId, scope);
+        signal?.throwIfAborted();
+        while (task?.status === "running" && Date.now() < deadline) {
+            await delay(Math.min(500, deadline - Date.now()), undefined, { signal });
+            signal?.throwIfAborted();
+            task = await getTask(taskId, scope);
+            signal?.throwIfAborted();
+        }
+        return task;
+    };
     return {
         "agent-teams": {
+            dedupe: false,
             tool: {
                 description: "Manage background tasks that run in their own task thread. Use action 'spawn' to start one, 'status' to check progress, 'read-result' to get a finished task's output, 'send' to message a running task, or 'list' to see all tasks. A successful spawn only means the task started and is running; do not report it as finished until status/read-result shows a terminal status. This is a background task, not a source-control branch.",
                 parameters: {
@@ -403,6 +432,12 @@ export function createTeamTools(deps) {
                             type: "string",
                             description: "(send) Message to send to the sub-agent",
                         },
+                        waitMs: {
+                            type: "integer",
+                            minimum: 0,
+                            maximum: 20000,
+                            description: "(status, read-result) Wait up to this many milliseconds for a terminal task. Defaults to 0 (immediate snapshot). A deadline can return queued/running; it does not mean completion or resume the parent automatically.",
+                        },
                     },
                     required: ["action"],
                 },
@@ -423,7 +458,7 @@ export function createTeamTools(deps) {
                 allowedValues: { action: ["status", "read-result", "list"] },
                 description: "Plan mode allows listing tasks and reading their status or results.",
             },
-            run: async (args) => {
+            run: async (args, context) => {
                 const action = args.action;
                 if (action === "spawn") {
                     if (!args.task)
@@ -481,8 +516,7 @@ export function createTeamTools(deps) {
                 if (action === "status") {
                     if (!args.taskId)
                         throw new Error("'taskId' is required for status");
-                    const { getTask } = await import("../agent-teams.js");
-                    const task = await getTask(args.taskId);
+                    const task = await readTask(args.taskId, args.waitMs === undefined ? 0 : args.waitMs, context);
                     if (!task)
                         return JSON.stringify({ error: "Task not found" });
                     return JSON.stringify({
@@ -500,8 +534,7 @@ export function createTeamTools(deps) {
                 if (action === "read-result") {
                     if (!args.taskId)
                         throw new Error("'taskId' is required for read-result");
-                    const { getTask } = await import("../agent-teams.js");
-                    const task = await getTask(args.taskId);
+                    const task = await readTask(args.taskId, args.waitMs === undefined ? 0 : args.waitMs, context);
                     if (!task)
                         return JSON.stringify({ error: "Task not found" });
                     if (task.status === "running") {