@gajae-code/coding-agent 0.10.2 → 0.11.1

package/src/tools/subagent.ts

@@ -80,8 +80,17 @@ export interface SubagentSnapshot {
 	modelFellBack?: boolean;
 }
 
+export type SubagentAwaitOutcome = "completed" | "timed_out" | "interrupted";
+
+const AWAIT_INTERRUPTED_GUIDANCE =
+	"Await interrupted; this subagent continues. Inspect its current state or cancel it only when necessary.";
+
 export interface SubagentToolDetails {
 	subagents: SubagentSnapshot[];
+	/** Await outcome for a live await receipt; omitted when no wait was started. */
+	awaitOutcome?: SubagentAwaitOutcome;
+	/** True only when the parent await was interrupted; the child was not cancelled. */
+	interrupted?: true;
 }
 
 export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentToolDetails> {
@@ -370,35 +379,50 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 		// the viewport (the source of the await-panel repaint storms).
 		emitIfChanged(true);
 
-		let timedOut = false;
+		let awaitOutcome: SubagentAwaitOutcome;
+		const { promise: timeoutPromise, resolve: resolveTimeout } = Promise.withResolvers<SubagentAwaitOutcome>();
+		const timeoutTimer = setTimeout(() => resolveTimeout("timed_out"), timeoutMs);
+		const completionPromise = Promise.all(runningJobs.map(job => job.promise)).then(() => "completed" as const);
+		let onAbort: (() => void) | undefined;
 		try {
-			const completionPromise = Promise.all(runningJobs.map(job => job.promise));
-			const timeoutPromise = Bun.sleep(timeoutMs).then(() => {
-				timedOut = true;
-			});
 			if (signal) {
-				const { promise: abortPromise, resolve: abortResolve } = Promise.withResolvers<void>();
-				const onAbort = () => abortResolve();
-				signal.addEventListener("abort", onAbort, { once: true });
-				try {
-					await Promise.race([completionPromise, timeoutPromise, abortPromise]);
-				} finally {
-					signal.removeEventListener("abort", onAbort);
-				}
+				const { promise: abortPromise, resolve: resolveAbort } = Promise.withResolvers<SubagentAwaitOutcome>();
+				onAbort = () => resolveAbort("interrupted");
+				if (signal.aborted) onAbort();
+				else signal.addEventListener("abort", onAbort, { once: true });
+				awaitOutcome = await Promise.race([completionPromise, timeoutPromise, abortPromise]);
 			} else {
-				await Promise.race([completionPromise, timeoutPromise]);
+				awaitOutcome = await Promise.race([completionPromise, timeoutPromise]);
 			}
 		} finally {
-			manager.unwatchJobs(watchedJobIds);
+			clearTimeout(timeoutTimer);
+			if (signal && onAbort) signal.removeEventListener("abort", onAbort);
 			if (progressTimer) clearInterval(progressTimer);
 		}
+		if (awaitOutcome !== "interrupted") {
+			const terminalWatchedJobIds = watchedJobIds.filter(jobId => {
+				const status = manager.getJob(jobId)?.status;
+				return status === "completed" || status === "failed" || status === "cancelled";
+			});
+			manager.acknowledgeDeliveries(terminalWatchedJobIds);
+		}
+		manager.unwatchJobs(watchedJobIds);
 
-		return await this.#buildRecordResult(manager, records, {
-			title: "Subagent await",
-			notFoundIds,
-			timedOut,
+		const finalRecords = this.#visibleRecordsByIds(
+			manager,
+			records.map(record => record.subagentId),
+			ownerFilter,
+		);
+		const finalNotFoundIds = [...new Set([...notFoundIds, ...records.map(record => record.subagentId)])].filter(
+			id => !finalRecords.some(record => record.subagentId === id),
+		);
+		return await this.#buildRecordResult(manager, finalRecords, {
+			title: awaitOutcome === "interrupted" ? "Subagent await interrupted" : "Subagent await",
+			notFoundIds: finalNotFoundIds,
+			timedOut: awaitOutcome === "timed_out",
 			verbosity: params.verbosity ?? "receipt",
 			attachLiveProgress: true,
+			awaitOutcome,
 		});
 	}
 
@@ -516,6 +540,7 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 			timedOut?: boolean;
 			verbosity?: SubagentParams["verbosity"];
 			attachLiveProgress?: boolean;
+			awaitOutcome?: SubagentAwaitOutcome;
 		},
 	): Promise<AgentToolResult<SubagentToolDetails>> {
 		const verifiedOutputIds = await this.#verifiedOutputIds(records);
@@ -530,18 +555,34 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 		for (const id of options.notFoundIds ?? []) {
 			snapshots.push(this.#missingSnapshot(id, "not_found", "No visible detached subagent matches this id."));
 		}
-		manager.acknowledgeDeliveries(
-			snapshots
-				.filter(
-					s =>
-						s.status !== "running" && s.status !== "paused" && s.status !== "queued" && s.status !== "not_found",
-				)
-				.map(s => s.jobId),
-		);
-		return this.#buildSnapshotResult(snapshots, options.title);
+		if (options.awaitOutcome !== "interrupted") {
+			manager.acknowledgeDeliveries(
+				snapshots
+					.filter(
+						s =>
+							s.status !== "running" &&
+							s.status !== "paused" &&
+							s.status !== "queued" &&
+							s.status !== "not_found",
+					)
+					.map(s => s.jobId),
+			);
+		}
+		if (options.awaitOutcome === "interrupted") {
+			for (const snapshot of snapshots) {
+				if (snapshot.status === "running" || snapshot.status === "paused" || snapshot.status === "queued") {
+					snapshot.guidance = AWAIT_INTERRUPTED_GUIDANCE;
+				}
+			}
+		}
+		return this.#buildSnapshotResult(snapshots, options.title, options.awaitOutcome);
 	}
 
-	#buildSnapshotResult(snapshots: SubagentSnapshot[], title: string): AgentToolResult<SubagentToolDetails> {
+	#buildSnapshotResult(
+		snapshots: SubagentSnapshot[],
+		title: string,
+		awaitOutcome?: SubagentAwaitOutcome,
+	): AgentToolResult<SubagentToolDetails> {
 		const lines = [`## ${title} (${snapshots.length})`, ""];
 		for (const snapshot of snapshots) {
 			lines.push(`### ${snapshot.id} — ${snapshot.status}`);
@@ -571,7 +612,11 @@ export class SubagentTool implements AgentTool<typeof subagentSchema, SubagentTo
 		}
 		return {
 			content: [{ type: "text", text: lines.join("\n").trimEnd() }],
-			details: { subagents: snapshots },
+			details: {
+				subagents: snapshots,
+				...(awaitOutcome ? { awaitOutcome } : {}),
+				...(awaitOutcome === "interrupted" ? { interrupted: true } : {}),
+			},
 		};
 	}
 
@@ -778,8 +823,15 @@ function previewJobOutput(
  * countdown ticking is sacrificed by design; every real transition still changes
  * the signature.
  */
-export function subagentAwaitRenderedStateSignature(subagents: readonly SubagentSnapshot[]): string {
-	return JSON.stringify(subagents.map(canonicalizeSnapshotForSignature));
+export function subagentAwaitRenderedStateSignature(
+	subagents: readonly SubagentSnapshot[],
+	receipt?: Pick<SubagentToolDetails, "awaitOutcome" | "interrupted">,
+): string {
+	return JSON.stringify({
+		awaitOutcome: receipt?.awaitOutcome ?? null,
+		interrupted: receipt?.interrupted === true,
+		subagents: subagents.map(canonicalizeSnapshotForSignature),
+	});
 }
 
 function canonicalizeSnapshotForSignature(snapshot: SubagentSnapshot): unknown {

package/src/tools/telegram-send.ts

@@ -2,8 +2,8 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@gajae-code/agent-core";
 import { z } from "zod/v4";
-import { getTelegramFileSink } from "../notifications/attachment-registry";
-import { getNotificationConfig, isGloballyConfigured } from "../notifications/config";
+import { getTelegramFileSink } from "../sdk/bus/attachment-registry";
+import { getNotificationConfig, isGloballyConfigured } from "../sdk/bus/config";
 import type { ToolSession } from "./index";
 
 const TELEGRAM_SEND_MAX_FILE_BYTES = 50 * 1024 * 1024;

package/vendor/insane-search/MANIFEST.json

@@ -20,7 +20,8 @@
   ],
   "exclusionRationale": "Excludes upstream install hooks (SessionStart settings.json mutation), GitHub star-baiting (gh api user/starred), the update-notifier, and the past-session transcript-language scanner. Only the runtime Phase 0-3 engine and its Playwright/stealth templates are vendored.",
   "localPatches": [
-    "engine/content_safety.py + FetchResult trust/risk metadata (content_trust, prompt_injection_risk, prompt_injection_signals, untrusted_content_boundary) and to_untrusted_text(): cherry-picked from insane-search a16f7c1 (upstream PR #5, v0.9.0). Adds prompt-injection labelling to the JSON surface (to_dict); the default CLI text output is intentionally left unchanged (plain content preserved, no envelope)."
+    "engine/content_safety.py + FetchResult trust/risk metadata (content_trust, prompt_injection_risk, prompt_injection_signals, untrusted_content_boundary) and to_untrusted_text(): cherry-picked from insane-search a16f7c1 (upstream PR #5, v0.9.0). Adds prompt-injection labelling to the JSON surface (to_dict); the default CLI text output is intentionally left unchanged (plain content preserved, no envelope).",
+    "engine/phase0.py _ytdlp_argv() console-script→module fallback + engine/bias_check.py rel.as_posix() Windows exemption + engine/tests/test_u9.py: cherry-picked from insane-search 33f898d (upstream PR #6, released v0.9.2). Cross-platform yt-dlp resolution; no capability or site logic added."
   ],
   "notes": "Runtime engine is invoked via `python3 -m engine \"<url>\" --json` with cwd=this directory and PYTHONPATH pointed at this directory. Phase 0-2 require python3 + curl_cffi; Phase 3 requires node + playwright/playwright-extra/puppeteer-extra-plugin-stealth installed under engine/templates. GJC never auto-installs these dependencies."
 }

package/vendor/insane-search/engine/bias_check.py

@@ -98,7 +98,10 @@ def _line_is_exempt(line: str, ext: str) -> bool:
 def _scan_file(path: Path, root: Path) -> list[str]:
     """Return list of violation strings for this file."""
     rel = path.relative_to(root.parent)
-    if str(rel) in EXPLICIT_ALLOW_FILES:
+    # Compare with forward slashes so the exemption matches on Windows too —
+    # `str(rel)` yields backslashes there, silently defeating the phase0.py
+    # exemption (EXPLICIT_ALLOW_FILES uses POSIX-style paths).
+    if rel.as_posix() in EXPLICIT_ALLOW_FILES:
         return []
 
     ext = path.suffix.lower()

package/vendor/insane-search/engine/phase0.py

@@ -24,8 +24,11 @@ Each attempt dict: {"route","platform","ok","status","bytes","note"}.
 """
 from __future__ import annotations
 
+import importlib.util
 import re
+import shutil
 import subprocess
+import sys
 from typing import Optional
 from urllib.parse import urlsplit
 
@@ -182,11 +185,33 @@ def _x(url: str, timeout: int) -> dict:
 
 
 # --- youtube -----------------------------------------------------------------
+def _ytdlp_argv() -> Optional[list[str]]:
+    """Best yt-dlp invocation for this environment, or None if unavailable.
+
+    Prefers the ``yt-dlp`` console script on PATH; falls back to
+    ``<python> -m yt_dlp`` when the script dir is not on PATH but the module is
+    importable — the common case for ``pip install --user`` and Windows / venv
+    installs, where the Scripts/bin dir is frequently absent from PATH. Mirrors
+    the ``which yt-dlp || python3 -m yt_dlp`` fallback already documented in
+    references/media.md."""
+    exe = shutil.which("yt-dlp")
+    if exe:
+        return [exe]
+    if importlib.util.find_spec("yt_dlp") is not None:
+        return [sys.executable, "-m", "yt_dlp"]
+    return None
+
+
 def _youtube(url: str, timeout: int) -> dict:
     attempts: list[dict] = []
+    argv = _ytdlp_argv()
+    if argv is None:
+        attempts.append(_attempt("youtube", "yt-dlp", False, 0, "", "yt-dlp not installed"))
+        return {"platform": "youtube", "ok": False, "route": None, "content": "",
+                "final_url": url, "attempts": attempts}
     try:
         p = subprocess.run(
-            ["yt-dlp", "--dump-json", "--skip-download", url],
+            argv + ["--dump-json", "--skip-download", url],
             capture_output=True, text=True, timeout=max(timeout, 60),
         )
         ok = p.returncode == 0 and p.stdout.strip().startswith("{")

package/dist/types/harness-control-plane/rpc-adapter.d.ts

@@ -1,69 +0,0 @@
-export interface RpcStateSnapshot {
-    isStreaming: boolean;
-    steeringQueueDepth: number;
-    followupQueueDepth: number;
-}
-/** Abstract handle to a live gajae-code RPC session. */
-export interface HarnessRpc {
-    getState(): Promise<RpcStateSnapshot>;
-    /** Send a prompt; resolves with the RPC command id and whether it was acked. Does NOT await agent_start. */
-    sendPrompt(prompt: string): Promise<{
-        commandId: string;
-        ack: boolean;
-    }>;
-    /** Monotonic count of events observed so far (the acceptance cursor). */
-    eventCursor(): number;
-    /** Resolve when an `agent_start` event arrives strictly after `afterCursor`, else null on timeout. */
-    waitForAgentStart(afterCursor: number, timeoutMs: number): Promise<{
-        cursor: number;
-    } | null>;
-    close(): Promise<void>;
-    /** Subscribe to parsed event frames (non-ready, non-response), fired AFTER the cursor advances. Returns unsubscribe. */
-    onEventFrame?(listener: (frame: Record<string, unknown>) => void): () => void;
-    /** Whether the underlying RPC subprocess is still alive. */
-    isLive?(): boolean;
-    /** ISO timestamp of the last observed event frame, or null. */
-    lastFrameAt?(): string | null;
-    /** Final assistant text from the live session (for review-verdict extraction); null when unavailable. */
-    getLastAssistantText?(): Promise<string | null>;
-}
-export interface AcceptanceResult {
-    accepted: boolean;
-    reason: string;
-    commandId: string | null;
-    preSubmitCursor: number;
-    agentStartCursor: number | null;
-    preSubmitState: RpcStateSnapshot;
-}
-/**
- * Single-flight acceptance: idle + empty-queue pre-state, ack, then the NEXT
- * `agent_start` after the pre-submit cursor within `timeoutMs`.
- */
-export declare function singleFlightAccept(rpc: HarnessRpc, prompt: string, timeoutMs: number): Promise<AcceptanceResult>;
-/**
- * Real adapter: spawns `gjc --mode rpc --session-dir <dir>` and speaks the JSONL
- * protocol from docs/rpc.md. Verified end-to-end in the M10 suite.
- */
-export declare class GajaeCodeRpc implements HarnessRpc {
-    #private;
-    constructor(opts: {
-        sessionDir: string;
-        command?: string[];
-        cwd?: string;
-        env?: NodeJS.ProcessEnv;
-    });
-    onEventFrame(listener: (frame: Record<string, unknown>) => void): () => void;
-    isLive(): boolean;
-    lastFrameAt(): string | null;
-    getState(): Promise<RpcStateSnapshot>;
-    getLastAssistantText(): Promise<string | null>;
-    sendPrompt(prompt: string): Promise<{
-        commandId: string;
-        ack: boolean;
-    }>;
-    eventCursor(): number;
-    waitForAgentStart(afterCursor: number, timeoutMs: number): Promise<{
-        cursor: number;
-    } | null>;
-    close(): Promise<void>;
-}

package/dist/types/modes/bridge/auth.d.ts

@@ -1,12 +0,0 @@
-export interface BridgeAuthConfig {
-    token: string;
-}
-export interface BridgeBindConfig {
-    hostname: string;
-    port: number;
-    tlsConfigured: boolean;
-}
-export declare function extractBearerToken(authorization: string | null | undefined): string | undefined;
-export declare function isBridgeTokenAuthorized(authorization: string | null | undefined, config: BridgeAuthConfig): boolean;
-export declare function isLoopbackHost(hostname: string): boolean;
-export declare function assertSafeBridgeBind(config: BridgeBindConfig): void;

package/dist/types/modes/bridge/bridge-client-bridge.d.ts

@@ -1,9 +0,0 @@
-import type { ClientBridge, ClientBridgePermissionOption, ClientBridgePermissionOutcome, ClientBridgePermissionToolCall } from "../../session/client-bridge";
-import type { UiRequestBroker } from "../shared/agent-wire/ui-request-broker";
-export interface BridgePermissionRequestPayload {
-    kind: "permission";
-    toolCall: ClientBridgePermissionToolCall;
-    options: ClientBridgePermissionOption[];
-}
-export type BridgePermissionBroker = UiRequestBroker<BridgePermissionRequestPayload, ClientBridgePermissionOutcome>;
-export declare function createBridgeClientBridge(broker: BridgePermissionBroker): ClientBridge;

package/dist/types/modes/bridge/bridge-mode.d.ts

@@ -1,47 +0,0 @@
-import type { ExtensionUIContext } from "../../extensibility/extensions";
-import type { AgentSession } from "../../session/agent-session";
-import type { ClientBridgePermissionOutcome } from "../../session/client-bridge";
-import type { RpcCommand, RpcResponse } from "../rpc/rpc-types";
-import { RpcHostToolBridge } from "../shared/agent-wire/host-tool-bridge";
-import { RpcHostUriBridge } from "../shared/agent-wire/host-uri-bridge";
-import { type BridgeCommandScope } from "../shared/agent-wire/scopes";
-import { UiRequestBroker } from "../shared/agent-wire/ui-request-broker";
-import type { BridgeUiResult } from "../shared/agent-wire/ui-result";
-import { UnattendedSessionControlPlane } from "../shared/agent-wire/unattended-session";
-import { type BridgePermissionRequestPayload } from "./bridge-client-bridge";
-import { type BridgeUiRequestPayload } from "./bridge-ui-context";
-import { BridgeEventStream } from "./event-stream";
-interface BridgeEndpointMatrix {
-    events: boolean;
-    commands: boolean;
-    control: boolean;
-    uiResponses: boolean;
-    hostToolResults: boolean;
-    hostUriResults: boolean;
-}
-interface BridgeFetchHandlerOptions {
-    sessionId: string;
-    token: string;
-    eventStream?: BridgeEventStream;
-    commandDispatcher?: (command: RpcCommand) => Promise<RpcResponse>;
-    commandScopes?: readonly BridgeCommandScope[];
-    idempotencyCache?: BridgeIdempotencyCache;
-    permissionBroker?: UiRequestBroker<BridgePermissionRequestPayload, ClientBridgePermissionOutcome>;
-    uiBroker?: UiRequestBroker<BridgeUiRequestPayload, BridgeUiResult<unknown>>;
-    hostToolBridge?: RpcHostToolBridge;
-    hostUriBridge?: RpcHostUriBridge;
-    endpointMatrix?: Partial<BridgeEndpointMatrix>;
-    unattendedControlPlane?: UnattendedSessionControlPlane;
-}
-interface BridgeIdempotencyRecord {
-    route: string;
-    ownerToken?: string;
-    body: string | Promise<string>;
-    response: unknown | Promise<unknown>;
-    pending?: boolean;
-}
-type BridgeIdempotencyCache = Map<string, BridgeIdempotencyRecord>;
-export declare function parseBridgeEndpoints(value: string | undefined): Partial<BridgeEndpointMatrix> | undefined;
-export declare function createBridgeFetchHandler(options: BridgeFetchHandlerOptions): (request: Request) => Promise<Response>;
-export declare function runBridgeMode(session: AgentSession, setToolUIContext?: (uiContext: ExtensionUIContext, hasUI: boolean) => void): Promise<never>;
-export {};

package/dist/types/modes/bridge/bridge-ui-context.d.ts

@@ -1,88 +0,0 @@
-import type { ExtensionUIContext, ExtensionUIDialogOptions, ExtensionWidgetContent, ExtensionWidgetOptions, TerminalInputHandler } from "../../extensibility/extensions";
-import type { UiRequestBroker } from "../shared/agent-wire/ui-request-broker";
-import type { BridgeUiResult } from "../shared/agent-wire/ui-result";
-import { type Theme } from "../theme/theme";
-export type BridgeUiRequestPayload = {
-    kind: "select";
-    title: string;
-    options: string[];
-    timeout?: number;
-} | {
-    kind: "confirm";
-    title: string;
-    message: string;
-    timeout?: number;
-} | {
-    kind: "input";
-    title: string;
-    placeholder?: string;
-    timeout?: number;
-} | {
-    kind: "editor";
-    title: string;
-    prefill?: string;
-    promptStyle?: boolean;
-} | {
-    kind: "notify";
-    message: string;
-    type?: "info" | "warning" | "error";
-} | {
-    kind: "status";
-    key: string;
-    text: string | undefined;
-} | {
-    kind: "widget";
-    key: string;
-    lines: string[] | undefined;
-    placement?: "aboveEditor" | "belowEditor";
-} | {
-    kind: "title";
-    title: string;
-} | {
-    kind: "set_editor_text";
-    text: string;
-} | {
-    kind: "unsupported";
-    capability: string;
-    reason: string;
-};
-export type BridgeUiBroker = UiRequestBroker<BridgeUiRequestPayload, BridgeUiResult<unknown>>;
-export type BridgeUiEmitter = (payload: BridgeUiRequestPayload) => void;
-export declare class BridgeExtensionUIContext implements ExtensionUIContext {
-    #private;
-    constructor(options: {
-        broker: BridgeUiBroker;
-        emit: BridgeUiEmitter;
-    });
-    select(title: string, options: string[], dialogOptions?: ExtensionUIDialogOptions): Promise<string | undefined>;
-    confirm(title: string, message: string, dialogOptions?: ExtensionUIDialogOptions): Promise<boolean>;
-    input(title: string, placeholder?: string, dialogOptions?: ExtensionUIDialogOptions): Promise<string | undefined>;
-    notify(message: string, type?: "info" | "warning" | "error"): void;
-    onTerminalInput(_handler: TerminalInputHandler): () => void;
-    setStatus(key: string, text: string | undefined): void;
-    setWorkingMessage(message?: string): void;
-    setWidget(key: string, content: ExtensionWidgetContent, options?: ExtensionWidgetOptions): void;
-    setFooter(_factory?: unknown): void;
-    setHeader(_factory?: unknown): void;
-    setTitle(title: string): void;
-    custom<T>(): Promise<T>;
-    setEditorText(text: string): void;
-    pasteToEditor(text: string): void;
-    getEditorText(): string;
-    editor(title: string, prefill?: string, dialogOptions?: ExtensionUIDialogOptions, editorOptions?: {
-        promptStyle?: boolean;
-    }): Promise<string | undefined>;
-    setEditorComponent(_factory?: unknown): void;
-    get theme(): Theme;
-    getAllThemes(): Promise<{
-        name: string;
-        path: string | undefined;
-    }[]>;
-    getTheme(_name: string): Promise<Theme | undefined>;
-    setTheme(_theme: string | Theme): Promise<{
-        success: boolean;
-        error?: string;
-    }>;
-    getToolsExpanded(): boolean;
-    setToolsExpanded(_expanded: boolean): void;
-}

package/dist/types/modes/bridge/event-stream.d.ts

@@ -1,8 +0,0 @@
-import type { BridgeFrameEnvelope } from "../shared/agent-wire/protocol";
-export declare class BridgeEventStream {
-    #private;
-    constructor(replayLimit?: number);
-    get frameCount(): number;
-    publish(frame: BridgeFrameEnvelope): void;
-    response(lastSeq?: number): Response;
-}

package/dist/types/modes/rpc/host-tools.d.ts

@@ -1 +0,0 @@
-export * from "../shared/agent-wire/host-tool-bridge";

package/dist/types/modes/rpc/host-uris.d.ts

@@ -1 +0,0 @@
-export * from "../shared/agent-wire/host-uri-bridge";