@antelopejs/dms-ai 0.1.6 → 0.2.1

package/sidecar/dist/agent/permission-preview.js

@@ -0,0 +1,203 @@
+import { readFile, stat } from "node:fs/promises";
+import { dirname } from "node:path";
+import { BUILDER_DELETE_RESOURCE_TOOL_NAME } from "../constants/tool-kinds.js";
+import { commandRulePrefix, detectDependencyChange, } from "./command-analysis.js";
+import { editTargetPaths, projectRelative, resolveInProject, } from "./edit-targets.js";
+import { diffTexts, parseUnifiedDiff } from "./line-diff.js";
+import { bareToolName, isBlockRemovalTool, isCommandTool, isDestructiveBuilderTool, permissionKindOf, } from "./tool-kinds.js";
+const MAX_PREVIEW_FILE_BYTES = 2 * 1024 * 1024;
+const FILE_ENCODING = "utf8";
+const WEB_FETCH_TOOL_NAME = "WebFetch";
+const CODEX_ADDED_KIND = "add";
+const CODEX_DELETED_KIND = "delete";
+export const CODEX_CHANGE_KIND_ARG = "change_kind";
+export const CODEX_CHANGE_DIFF_ARG = "diff";
+const BUILDER_TARGET_KEYS = [
+    "pageRef",
+    "ref",
+    "path",
+    "query",
+];
+function asRecord(args) {
+    if (args === null || typeof args !== "object" || Array.isArray(args)) {
+        return {};
+    }
+    return args;
+}
+function readString(args, key) {
+    const value = asRecord(args)[key];
+    return typeof value === "string" ? value : "";
+}
+async function readCurrent(path) {
+    try {
+        const info = await stat(path);
+        if (!info.isFile() || info.size > MAX_PREVIEW_FILE_BYTES)
+            return "";
+        return await readFile(path, FILE_ENCODING);
+    }
+    catch {
+        return null;
+    }
+}
+function replaceOnce(text, oldString, newString, replaceAll) {
+    if (oldString.length === 0 || !text.includes(oldString))
+        return null;
+    if (replaceAll)
+        return text.split(oldString).join(newString);
+    return text.replace(oldString, () => newString);
+}
+function applyEditStep(text, step) {
+    if (text === null)
+        return null;
+    return replaceOnce(text, typeof step.old_string === "string" ? step.old_string : "", typeof step.new_string === "string" ? step.new_string : "", step.replace_all === true);
+}
+function editSteps(toolName, args) {
+    const record = asRecord(args);
+    if (bareToolName(toolName) !== "MultiEdit")
+        return [record];
+    return Array.isArray(record.edits) ? record.edits : [];
+}
+function plannedDiff(toolName, args, current) {
+    const content = asRecord(args).content;
+    if (typeof content === "string")
+        return diffTexts(current ?? "", content);
+    const steps = editSteps(toolName, args);
+    const edited = steps.reduce(applyEditStep, current);
+    if (edited !== null && current !== null)
+        return diffTexts(current, edited);
+    const fallback = steps[0] ?? {};
+    return diffTexts(readString(fallback, "old_string"), readString(fallback, "new_string"));
+}
+const CODEX_DIFF_BY_KIND = {
+    [CODEX_ADDED_KIND]: (diff) => diffTexts("", diff),
+    [CODEX_DELETED_KIND]: (diff, current) => diffTexts(current ?? diff, ""),
+};
+function codexDiff(args, current) {
+    const diff = readString(args, CODEX_CHANGE_DIFF_ARG);
+    const kind = readString(args, CODEX_CHANGE_KIND_ARG);
+    const byKind = CODEX_DIFF_BY_KIND[kind];
+    return byKind === undefined ? parseUnifiedDiff(diff) : byKind(diff, current);
+}
+async function diffPreview(options) {
+    const [target] = editTargetPaths(options.args);
+    if (target === undefined)
+        return null;
+    const path = resolveInProject(options.hostProjectRoot, target);
+    const current = await readCurrent(path);
+    const isCodex = CODEX_CHANGE_KIND_ARG in asRecord(options.args);
+    const stats = isCodex
+        ? codexDiff(options.args, current)
+        : plannedDiff(options.toolName, options.args, current);
+    const kind = readString(options.args, CODEX_CHANGE_KIND_ARG);
+    return {
+        type: "diff",
+        path,
+        relativePath: projectRelative(options.hostProjectRoot, path),
+        isNewFile: current === null || kind === CODEX_ADDED_KIND,
+        ...stats,
+    };
+}
+function commandPreview(options) {
+    const command = readString(options.args, "command");
+    const change = detectDependencyChange(command);
+    const preview = {
+        type: "command",
+        command,
+        cwd: options.hostProjectRoot,
+    };
+    if (change === null)
+        return preview;
+    return { ...preview, effect: change.effect, touches: change.touches };
+}
+function builderTarget(args) {
+    const key = BUILDER_TARGET_KEYS.find((k) => readString(args, k) !== "");
+    return key === undefined ? "" : readString(args, key);
+}
+function destructivePreview(options) {
+    const operation = bareToolName(options.toolName);
+    const target = builderTarget(options.args);
+    const deletesData = operation === BUILDER_DELETE_RESOURCE_TOOL_NAME;
+    const preview = {
+        type: "destructive",
+        operation,
+        target,
+        consequence: deletesData ? "deletes_data" : "removes_code",
+        canKeepData: deletesData,
+    };
+    return deletesData ? { ...preview, confirmText: target } : preview;
+}
+function webPreview(options) {
+    const url = readString(options.args, "url");
+    const host = hostOf(url);
+    if (host === null)
+        return genericPreview(options);
+    return { type: "web", url, host };
+}
+function genericPreview(options) {
+    return { type: "generic", args: asRecord(options.args) };
+}
+export function hostOf(url) {
+    try {
+        return new URL(url).hostname || null;
+    }
+    catch {
+        return null;
+    }
+}
+const PREVIEW_BY_KIND = {
+    edit: async (options) => (await diffPreview(options)) ?? genericPreview(options),
+    command: async (options) => commandPreview(options),
+    web: async (options) => webPreview(options),
+    destructive: async (options) => destructivePreview(options),
+    builder: async (options) => genericPreview(options),
+    other: async (options) => genericPreview(options),
+};
+function isAlwaysAsk(options) {
+    if (isDestructiveBuilderTool(options.toolName))
+        return true;
+    if (options.alwaysAskBlockRemoval && isBlockRemovalTool(options.toolName)) {
+        return true;
+    }
+    if (!options.alwaysAskDependencies || !isCommandTool(options.toolName)) {
+        return false;
+    }
+    return detectDependencyChange(readString(options.args, "command")) !== null;
+}
+function editRuleOptions(options) {
+    const targets = editTargetPaths(options.args).map((target) => resolveInProject(options.hostProjectRoot, target));
+    const [first] = targets;
+    if (first === undefined)
+        return [];
+    const relativeOf = (path) => projectRelative(options.hostProjectRoot, path);
+    const directories = new Set(targets.map((path) => dirname(path)));
+    const fileRules = targets.length === 1 ? [{ kind: "file", value: relativeOf(first) }] : [];
+    const directoryRules = directories.size === 1
+        ? [{ kind: "directory", value: relativeOf(dirname(first)) }]
+        : [];
+    return [...fileRules, ...directoryRules];
+}
+function commandRuleOptions(options) {
+    const prefix = commandRulePrefix(readString(options.args, "command"));
+    return prefix === null ? [] : [{ kind: "command", value: prefix }];
+}
+function webRuleOptions(options) {
+    if (bareToolName(options.toolName) !== WEB_FETCH_TOOL_NAME)
+        return [];
+    const host = hostOf(readString(options.args, "url"));
+    return host === null ? [] : [{ kind: "domain", value: host }];
+}
+const RULE_OPTIONS_BY_KIND = {
+    edit: editRuleOptions,
+    command: commandRuleOptions,
+    web: webRuleOptions,
+};
+export async function describeRequest(options) {
+    const kind = permissionKindOf(options.toolName);
+    const alwaysAsk = isAlwaysAsk(options);
+    const preview = await PREVIEW_BY_KIND[kind](options);
+    const ruleOptions = alwaysAsk
+        ? []
+        : (RULE_OPTIONS_BY_KIND[kind]?.(options) ?? []);
+    return { kind, alwaysAsk, preview, ruleOptions };
+}
+//# sourceMappingURL=permission-preview.js.map

package/sidecar/dist/agent/permission-preview.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"permission-preview.js","sourceRoot":"","sources":["../../src/agent/permission-preview.ts"],"names":[],"mappings":"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"}

package/sidecar/dist/agent/permission-rules.d.ts

@@ -0,0 +1,17 @@
+import type { ActiveRuleType } from "../protocol/events.js";
+import type { PermissionRuleType } from "../protocol/messages.js";
+interface RuleSubject {
+    toolName: string;
+    args: unknown;
+    hostProjectRoot: string;
+}
+export interface PermissionRuleStore {
+    add(conversationId: string, rule: PermissionRuleType): ActiveRuleType;
+    revoke(conversationId: string, ruleId: string): boolean;
+    list(conversationId: string): ActiveRuleType[];
+    matches(conversationId: string, subject: RuleSubject): boolean;
+    forget(conversationId: string): void;
+}
+export declare function isSameRule(a: PermissionRuleType, b: PermissionRuleType): boolean;
+export declare function createPermissionRuleStore(): PermissionRuleStore;
+export {};

package/sidecar/dist/agent/permission-rules.js

@@ -0,0 +1,95 @@
+import { randomUUID } from "node:crypto";
+import { isCommandCovered } from "./command-analysis.js";
+import { editTargetPaths, isWithinDirectory, resolveInProject, } from "./edit-targets.js";
+import { hostOf } from "./permission-preview.js";
+import { isCommandTool, isEditTool, isWebTool } from "./tool-kinds.js";
+const RULE_LABELS = {
+    file: (value) => `Edits to ${value}`,
+    directory: (value) => `Edits under ${value === "." ? "the project" : value}`,
+    command: (value) => `Commands starting with "${value}"`,
+    domain: (value) => `Requests to ${value}`,
+};
+function argString(args, key) {
+    if (args === null || typeof args !== "object")
+        return "";
+    const value = args[key];
+    return typeof value === "string" ? value : "";
+}
+function resolvedTargets(subject) {
+    return editTargetPaths(subject.args).map((target) => resolveInProject(subject.hostProjectRoot, target));
+}
+function coversEveryTarget(subject, covers) {
+    if (!isEditTool(subject.toolName))
+        return false;
+    const targets = resolvedTargets(subject);
+    return targets.length > 0 && targets.every(covers);
+}
+function valuesOf(rules, kind) {
+    return rules.filter((rule) => rule.kind === kind).map((rule) => rule.value);
+}
+function matchesEditRules(rules, subject) {
+    const resolveValue = (value) => resolveInProject(subject.hostProjectRoot, value);
+    const files = valuesOf(rules, "file").map(resolveValue);
+    const directories = valuesOf(rules, "directory").map(resolveValue);
+    return coversEveryTarget(subject, (target) => files.includes(target) ||
+        directories.some((directory) => isWithinDirectory(directory, target)));
+}
+function matchesCommandRules(rules, subject) {
+    if (!isCommandTool(subject.toolName))
+        return false;
+    return isCommandCovered(argString(subject.args, "command"), valuesOf(rules, "command"));
+}
+function matchesDomainRules(rules, subject) {
+    if (!isWebTool(subject.toolName))
+        return false;
+    const host = hostOf(argString(subject.args, "url"));
+    return host !== null && valuesOf(rules, "domain").includes(host);
+}
+const RULE_MATCHERS = [
+    matchesEditRules,
+    matchesCommandRules,
+    matchesDomainRules,
+];
+function ruleLabel(rule) {
+    return RULE_LABELS[rule.kind](rule.value);
+}
+export function isSameRule(a, b) {
+    return a.kind === b.kind && a.value === b.value;
+}
+export function createPermissionRuleStore() {
+    const byConversation = new Map();
+    const rulesOf = (conversationId) => byConversation.get(conversationId) ?? [];
+    return {
+        add(conversationId, rule) {
+            const existing = rulesOf(conversationId).find((r) => isSameRule(r, rule));
+            if (existing !== undefined)
+                return existing;
+            const active = {
+                id: randomUUID(),
+                kind: rule.kind,
+                value: rule.value,
+                label: ruleLabel(rule),
+                createdAtMs: Date.now(),
+            };
+            byConversation.set(conversationId, [...rulesOf(conversationId), active]);
+            return active;
+        },
+        revoke(conversationId, ruleId) {
+            const rules = rulesOf(conversationId);
+            const next = rules.filter((rule) => rule.id !== ruleId);
+            byConversation.set(conversationId, next);
+            return next.length !== rules.length;
+        },
+        list: (conversationId) => [...rulesOf(conversationId)],
+        matches(conversationId, subject) {
+            const rules = rulesOf(conversationId);
+            if (rules.length === 0)
+                return false;
+            return RULE_MATCHERS.some((matcher) => matcher(rules, subject));
+        },
+        forget(conversationId) {
+            byConversation.delete(conversationId);
+        },
+    };
+}
+//# sourceMappingURL=permission-rules.js.map

package/sidecar/dist/agent/permission-rules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"permission-rules.js","sourceRoot":"","sources":["../../src/agent/permission-rules.ts"],"names":[],"mappings":"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"}

package/sidecar/dist/agent/provider.d.ts

@@ -1,4 +1,4 @@
-import type { PermissionDecision } from "../constants/permissions.js";
+import type { AllowedBy } from "../constants/audit.js";
 import type { AiMcpServer } from "../mcp/types.js";
 import type { AttachmentType } from "../protocol/messages.js";
 import type { SkillSource } from "../skills/types.js";
@@ -11,14 +11,23 @@ export interface TurnInput {
     text: string;
     attachments: readonly AttachmentType[];
 }
-export interface ProviderSessionContext {
+export interface ToolDecision {
+    callId?: string;
+    toolName: string;
+    allowedBy: AllowedBy;
+}
+export interface ToolCallHooks {
+    onToolDecision?: (decision: ToolDecision) => void;
+    onToolAnnounced?: (callId: string, toolName: string, args: unknown) => void;
+    beforeMutation?: () => Promise<void>;
+}
+export interface ProviderSessionContext extends ToolCallHooks {
     conversationId: string;
     hostProjectRoot: string;
     getCurrentPage: () => CurrentPage;
     settings: AppSettings;
     permissionBus?: PermissionBus;
     mcpServer?: AiMcpServer;
-    onPermissionDecision?: (toolName: string, decision: PermissionDecision) => void;
     onTokenUsage?: (usage: TokenUsage) => void;
     onDisposed: (disposal: Promise<void>) => void;
 }
@@ -37,4 +46,3 @@ export interface AgentProviderOptions {
     moduleRoots?: string[];
     skillDirs?: SkillSource[];
 }
-export type AgentProviderFactory = (options?: AgentProviderOptions) => AgentProvider;

package/sidecar/dist/agent/question-bus.d.ts

@@ -1,22 +1,34 @@
 import type { QuestionType } from "../protocol/events.js";
-export type QuestionAnswers = string[] | null;
+export interface QuestionReply {
+    answers: string[];
+    skipped: boolean[];
+}
+export type QuestionAnswers = QuestionReply | null;
 export interface QuestionRequest {
     conversationId: string;
     questions: QuestionType[];
+    callId?: string;
 }
 export interface PendingQuestion {
     requestId: string;
     conversationId: string;
     questions: QuestionType[];
+    createdAtMs: number;
+    expiresAtMs: number;
 }
 export interface QuestionBusOptions {
     onPromptChat: (event: PendingQuestion) => void;
+    onAnswered?: (event: PendingQuestion, reply: QuestionReply) => void;
+    onExpired?: (event: PendingQuestion) => void;
+    onSettled?: (event: PendingQuestion) => void;
     timeoutMs?: number;
 }
 export interface QuestionBus {
     requestQuestion: (req: QuestionRequest) => Promise<QuestionAnswers>;
-    resolveQuestion: (requestId: string, answers: string[]) => void;
+    resolveQuestion: (requestId: string, reply: QuestionReply) => void;
+    countPending: (conversationId?: string) => number;
     getPendingForConversation: (conversationId: string) => PendingQuestion[];
     cancelConversation: (conversationId: string) => void;
+    cancelCall: (conversationId: string, callId: string) => void;
 }
 export declare function createQuestionBus(opts: QuestionBusOptions): QuestionBus;

package/sidecar/dist/agent/question-bus.js

@@ -5,29 +5,40 @@ function pendingToQuestion(pending) {
         requestId: pending.requestId,
         conversationId: pending.conversationId,
         questions: pending.questions,
+        createdAtMs: pending.createdAtMs,
+        expiresAtMs: pending.expiresAtMs,
     };
 }
 function settlePending(state, pending, answers) {
     clearTimeout(pending.timer);
     state.pending.delete(pending.requestId);
+    state.onSettled?.(pendingToQuestion(pending));
     pending.resolve(answers);
 }
+function expirePending(state, pending) {
+    state.onExpired?.(pendingToQuestion(pending));
+    settlePending(state, pending, null);
+}
 function scheduleTimeout(state, requestId) {
     return setTimeout(() => {
         const pending = state.pending.get(requestId);
         if (!pending)
             return;
         console.warn(`${QUESTION_LOG_PREFIX} ${QUESTION_TIMEOUT_REASON} (requestId=${requestId})`);
-        settlePending(state, pending, null);
+        expirePending(state, pending);
     }, state.timeoutMs);
 }
 function registerPending(state, req, resolve) {
     const requestId = randomUUID();
     const timer = scheduleTimeout(state, requestId);
+    const createdAtMs = Date.now();
     const pending = {
         requestId,
         conversationId: req.conversationId,
         questions: req.questions,
+        callId: req.callId,
+        createdAtMs,
+        expiresAtMs: createdAtMs + state.timeoutMs,
         resolve,
         timer,
     };
@@ -40,13 +51,14 @@ function startRequest(state, req) {
         state.onPromptChat(event);
     });
 }
-function handleResolve(state, requestId, answers) {
+function handleResolve(state, requestId, reply) {
     const pending = state.pending.get(requestId);
     if (!pending) {
         console.warn(`${QUESTION_LOG_PREFIX} ${QUESTION_UNKNOWN_REQUEST_REASON} (requestId=${requestId})`);
         return;
     }
-    settlePending(state, pending, answers);
+    state.onAnswered?.(pendingToQuestion(pending), reply);
+    settlePending(state, pending, reply);
 }
 function collectPendingForConversation(state, conversationId) {
     const out = [];
@@ -57,18 +69,17 @@ function collectPendingForConversation(state, conversationId) {
     }
     return out;
 }
-function cancelConversation(state, conversationId) {
+function expireMatching(state, matches) {
     for (const pending of [...state.pending.values()]) {
-        if (pending.conversationId !== conversationId)
-            continue;
-        settlePending(state, pending, null);
+        if (matches(pending))
+            expirePending(state, pending);
     }
 }
 function buildState(opts) {
     return {
+        ...opts,
         pending: new Map(),
         timeoutMs: opts.timeoutMs ?? QUESTION_TIMEOUT_MS,
-        onPromptChat: opts.onPromptChat,
     };
 }
 export function createQuestionBus(opts) {
@@ -77,14 +88,22 @@ export function createQuestionBus(opts) {
         requestQuestion(req) {
             return startRequest(state, req);
         },
-        resolveQuestion(requestId, answers) {
-            handleResolve(state, requestId, answers);
+        resolveQuestion(requestId, reply) {
+            handleResolve(state, requestId, reply);
+        },
+        countPending(conversationId) {
+            if (conversationId === undefined)
+                return state.pending.size;
+            return collectPendingForConversation(state, conversationId).length;
         },
         getPendingForConversation(conversationId) {
             return collectPendingForConversation(state, conversationId);
         },
         cancelConversation(conversationId) {
-            cancelConversation(state, conversationId);
+            expireMatching(state, (p) => p.conversationId === conversationId);
+        },
+        cancelCall(conversationId, callId) {
+            expireMatching(state, (p) => p.conversationId === conversationId && p.callId === callId);
         },
     };
 }

package/sidecar/dist/agent/question-bus.js.map

@@ -1 +1 @@
-{"version":3,"file":"question-bus.js","sourceRoot":"","sources":["../../src/agent/question-bus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"question-bus.js","sourceRoot":"","sources":["../../src/agent/question-bus.ts"],"names":[],"mappings":"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"}

package/sidecar/dist/agent/runner-events.d.ts

@@ -19,8 +19,9 @@ export interface RunnerToolResult {
     callId: string;
     result: unknown;
     isError: boolean;
+    isStopped?: boolean;
 }
-export interface RunnerDone {
+interface RunnerDone {
     type: "done";
 }
 export interface RunnerError {
@@ -34,3 +35,4 @@ export interface RunnerActivity {
     detail?: string;
 }
 export type RunnerEvent = RunnerAssistantText | RunnerAssistantTextDelta | RunnerToolUse | RunnerToolResult | RunnerDone | RunnerError | RunnerActivity;
+export {};

package/sidecar/dist/agent/runner.d.ts

@@ -1,20 +1,19 @@
-import type { PermissionDecision } from "../constants/permissions.js";
 import type { AiMcpServer } from "../mcp/types.js";
 import type { AttachmentType } from "../protocol/messages.js";
 import type { CurrentPage } from "../state/host-state.js";
 import type { AppSettings } from "../state/settings-types.js";
 import type { TokenUsage } from "../state/types.js";
 import type { PermissionBus } from "./permission-bus.js";
-import type { AgentProvider } from "./provider.js";
+import type { AgentProvider, ToolCallHooks } from "./provider.js";
 import type { RunnerError, RunnerEvent } from "./runner-events.js";
-export interface RunnerContext {
+export interface RunnerContext extends ToolCallHooks {
     conversationId: string;
     hostProjectRoot: string;
     getCurrentPage: () => CurrentPage;
     attachments?: AttachmentType[];
+    includePageContext?: boolean;
     permissionBus?: PermissionBus;
     createMcpServer?: () => AiMcpServer;
-    onPermissionDecision?: (toolName: string, decision: PermissionDecision) => void;
     onTokenUsage?: (usage: TokenUsage) => void;
 }
 export interface AgentRunner {
@@ -22,9 +21,12 @@ export interface AgentRunner {
     interruptSession(conversationId: string): void;
     disposeSession(conversationId: string): Promise<void>;
     applySettings(settings: AppSettings): void;
+    refreshSession(conversationId: string): void;
     dispose(reason?: RunnerError): Promise<void>;
 }
+export type ConversationSettingsResolver = (conversationId: string, settings: AppSettings) => AppSettings;
 export interface AgentRunnerOptions {
     settings?: AppSettings;
+    resolveSettings?: ConversationSettingsResolver;
 }
 export declare function createAgentRunner(provider: AgentProvider, options?: AgentRunnerOptions): AgentRunner;