@jay-framework/aiditor 0.19.6 → 0.19.7

package/dist/index.d.ts

@@ -107,6 +107,18 @@ interface SubmitTaskActionOutput {
 
 declare const submitTaskAction: _jay_framework_fullstack_component.JayStreamAction<SubmitTaskActionInput, SubmitTaskActionOutput> & _jay_framework_fullstack_component.JayStreamActionDefinition<SubmitTaskActionInput, SubmitTaskActionOutput, []>;
 
+declare const cancelAgentTaskAction: _jay_framework_fullstack_component.JayAction<{
+    pageRoute?: string;
+    renderedUrl?: string;
+}, {
+    cancelled: boolean;
+}> & _jay_framework_fullstack_component.JayActionDefinition<{
+    pageRoute?: string;
+    renderedUrl?: string;
+}, {
+    cancelled: boolean;
+}, []>;
+
 /** Design Log #19 — Add Menu agreement types (M19.1). */
 type AddMenuItem = {
     /** Stable unique id, convention: `<pluginName>:<slug>` */
@@ -368,7 +380,7 @@ declare const generateAddPageBriefFromImageAction: _jay_framework_fullstack_comp
     ok: boolean;
     markdown: string;
     suggestedRoute: string;
-    suggestedRouteKind: "dynamic" | "static";
+    suggestedRouteKind: "static" | "dynamic";
     referenceAttachments: {
         id: string;
         path: string;
@@ -392,7 +404,7 @@ declare const generateAddPageBriefFromImageAction: _jay_framework_fullstack_comp
     ok: boolean;
     markdown: string;
     suggestedRoute: string;
-    suggestedRouteKind: "dynamic" | "static";
+    suggestedRouteKind: "static" | "dynamic";
     referenceAttachments: {
         id: string;
         path: string;
@@ -687,6 +699,39 @@ declare const syncAddMenuAttachmentsAction: _jay_framework_fullstack_component.J
     error?: string;
 }, [_jay_framework_dev_server.DevServerService]>;
 
+declare const checkAiditorPublishAction: _jay_framework_fullstack_component.JayAction<unknown, {
+    hasPublishScript: boolean;
+}> & _jay_framework_fullstack_component.JayActionDefinition<unknown, {
+    hasPublishScript: boolean;
+}, []>;
+declare const runAiditorPublishAction: _jay_framework_fullstack_component.JayStreamAction<unknown, {
+    type: "output";
+    stream: "stdout" | "stderr";
+    text: string;
+} | {
+    type: "complete";
+    success: boolean;
+    code: number | null;
+} | {
+    type: "error";
+    message: string;
+} | {
+    type: string;
+}> & _jay_framework_fullstack_component.JayStreamActionDefinition<unknown, {
+    type: "output";
+    stream: "stdout" | "stderr";
+    text: string;
+} | {
+    type: "complete";
+    success: boolean;
+    code: number | null;
+} | {
+    type: "error";
+    message: string;
+} | {
+    type: string;
+}, []>;
+
 declare function setupAiditor(ctx: PluginSetupContext): Promise<PluginSetupResult>;
 
-export { checkAddPageRouteAction, checkPageAddPageBriefAction, checkPluginUpdateAction, ensureProjectPluginAction, generateAddPageBriefFromImageAction, getAiditorBootstrap, getPageParamsAction, getPluginSetupStatusAction, getProjectInfoAction, listAddMenuItemsAction, listFreezesAction, listJayPluginsAction, listPluginContractsAction, openAddPageFromBriefAction, readFileAction, reclassifyAddPageAssetAction, rerunPluginSetupAction, resolveAddMenuContractParamsAction, saveAddPageDraftAction, setupAiditor, startAddPageRequestAction, submitAddPageAction, submitTaskAction, syncAddMenuAttachmentsAction, syncAddPagePluginManifestAction, uploadAddPageAssetAction, writePluginSourceAction };
+export { cancelAgentTaskAction, checkAddPageRouteAction, checkAiditorPublishAction, checkPageAddPageBriefAction, checkPluginUpdateAction, ensureProjectPluginAction, generateAddPageBriefFromImageAction, getAiditorBootstrap, getPageParamsAction, getPluginSetupStatusAction, getProjectInfoAction, listAddMenuItemsAction, listFreezesAction, listJayPluginsAction, listPluginContractsAction, openAddPageFromBriefAction, readFileAction, reclassifyAddPageAssetAction, rerunPluginSetupAction, resolveAddMenuContractParamsAction, runAiditorPublishAction, saveAddPageDraftAction, setupAiditor, startAddPageRequestAction, submitAddPageAction, submitTaskAction, syncAddMenuAttachmentsAction, syncAddPagePluginManifestAction, uploadAddPageAssetAction, writePluginSourceAction };

package/dist/index.js

@@ -230,6 +230,49 @@ async function replaceRouteSessionAfterStaleResume(projectDir, routeKey) {
     return { sessionId };
   });
 }
+function isDynamicJayRoute(templateRoute) {
+  return templateRoute.includes(":") || templateRoute.includes("[");
+}
+function resolveAgentContextKey(input) {
+  const template = normalizePageRoute(input.pageRoute);
+  if (!isDynamicJayRoute(template)) {
+    return template;
+  }
+  if (input.renderedUrl?.trim()) {
+    try {
+      const pathname = new URL(input.renderedUrl.trim(), "http://aiditor.local").pathname;
+      return normalizePageRoute(pathname);
+    } catch {
+    }
+  }
+  return template;
+}
+const activeTokens = /* @__PURE__ */ new Map();
+const cancelledRoutes = /* @__PURE__ */ new Set();
+function beginCancellableAgentTask(routeKey) {
+  const token = Symbol("agent-task-cancel");
+  activeTokens.set(routeKey, token);
+  cancelledRoutes.delete(routeKey);
+  return token;
+}
+function endCancellableAgentTask(routeKey, token) {
+  if (activeTokens.get(routeKey) !== token) return;
+  activeTokens.delete(routeKey);
+  cancelledRoutes.delete(routeKey);
+}
+function isAgentTaskCancelled(routeKey) {
+  return cancelledRoutes.has(routeKey);
+}
+function cancelAgentTask(routeKey) {
+  const hadActiveTask = activeTokens.has(routeKey);
+  cancelledRoutes.add(routeKey);
+  endRouteQuery(routeKey);
+  return hadActiveTask;
+}
+function forceReleaseAgentRoute(routeKey) {
+  cancelledRoutes.add(routeKey);
+  endRouteQuery(routeKey);
+}
 const AGENT_KIT_PREAMBLE = `You are working in a Jay Stack project. The current working directory is the project root.
 - Read agent-kit/plugins-index.yaml for installed plugins and materialized contract paths.
 - Follow Jay Stack conventions for pages, routing, and headless component binding.
@@ -272,6 +315,31 @@ function buildChatPrompt(config, pageRoute, renderedUrl, userMessage) {
   ];
   return lines.filter((l) => l !== null).join("\n");
 }
+function groupAddMenuItems(items) {
+  const byCategory = /* @__PURE__ */ new Map();
+  for (const item of items) {
+    const sub = item.subCategory ?? null;
+    let subMap = byCategory.get(item.category);
+    if (!subMap) {
+      subMap = /* @__PURE__ */ new Map();
+      byCategory.set(item.category, subMap);
+    }
+    const list = subMap.get(sub) ?? [];
+    list.push(item);
+    subMap.set(sub, list);
+  }
+  return [...byCategory.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([category, subMap]) => ({
+    category,
+    subCategories: [...subMap.entries()].sort(([a], [b]) => {
+      const sa = a ?? "";
+      const sb = b ?? "";
+      return sa.localeCompare(sb);
+    }).map(([subCategory, subItems]) => ({
+      subCategory,
+      items: subItems.sort((a, b) => a.title.localeCompare(b.title))
+    }))
+  }));
+}
 const REJECTED_ITEM_FIELDS = [
   "kind",
   "parameters",
@@ -503,31 +571,6 @@ function pluginNameFromItem(item) {
   if (colon > 0) return item.id.slice(0, colon);
   return null;
 }
-function groupAddMenuItems(items) {
-  const byCategory = /* @__PURE__ */ new Map();
-  for (const item of items) {
-    const sub = item.subCategory ?? null;
-    let subMap = byCategory.get(item.category);
-    if (!subMap) {
-      subMap = /* @__PURE__ */ new Map();
-      byCategory.set(item.category, subMap);
-    }
-    const list = subMap.get(sub) ?? [];
-    list.push(item);
-    subMap.set(sub, list);
-  }
-  return [...byCategory.entries()].sort(([a], [b]) => a.localeCompare(b)).map(([category, subMap]) => ({
-    category,
-    subCategories: [...subMap.entries()].sort(([a], [b]) => {
-      const sa = a ?? "";
-      const sb = b ?? "";
-      return sa.localeCompare(sb);
-    }).map(([subCategory, subItems]) => ({
-      subCategory,
-      items: subItems.sort((a, b) => a.title.localeCompare(b.title))
-    }))
-  }));
-}
 async function listAddMenuItems(projectRoot) {
   const addMenuDir = path.join(projectRoot, ADD_MENU_DIR);
   const warnings = [];
@@ -1155,7 +1198,10 @@ const submitTaskAction = makeJayStream("aiditor.submitTask").withFiles().withHan
   }
   yield { type: "status", message: "Running agent..." };
   const systemPrompt = loadAgentKitSystemPrompt(projectDir);
-  const routeKey = normalizePageRoute(input.pageRoute);
+  const routeKey = resolveAgentContextKey({
+    pageRoute: input.pageRoute ?? "/",
+    renderedUrl: input.renderedUrl
+  });
   const sessionPlan = await getOrCreateSessionIdForRoute(
     projectDir,
     routeKey
@@ -1176,6 +1222,7 @@ const submitTaskAction = makeJayStream("aiditor.submitTask").withFiles().withHan
     persistSession: true,
     systemPrompt
   };
+  const cancelToken = beginCancellableAgentTask(routeKey);
   try {
     async function* streamAgentQuery(opts) {
       for await (const message of query({
@@ -1185,6 +1232,9 @@ const submitTaskAction = makeJayStream("aiditor.submitTask").withFiles().withHan
           ...opts
         }
       })) {
+        if (isAgentTaskCancelled(routeKey)) {
+          return;
+        }
         for (const chunk of transformSDKMessage(message)) {
           yield chunk;
         }
@@ -1226,10 +1276,24 @@ const submitTaskAction = makeJayStream("aiditor.submitTask").withFiles().withHan
       }
     }
   } finally {
+    endCancellableAgentTask(routeKey, cancelToken);
     endRouteQuery(routeKey);
   }
   yield { type: "done" };
 });
+const cancelAgentTaskAction = makeJayQuery(
+  "aiditor.cancelAgentTask"
+).withHandler(async (input) => {
+  const routeKey = resolveAgentContextKey({
+    pageRoute: input.pageRoute ?? "/",
+    renderedUrl: input.renderedUrl
+  });
+  const cancelled = cancelAgentTask(routeKey);
+  if (!cancelled) {
+    forceReleaseAgentRoute(routeKey);
+  }
+  return { cancelled: true };
+});
 class AddPagePromptLoadError extends Error {
   constructor(message) {
     super(message);
@@ -2055,7 +2119,7 @@ When the image is a formal Figma **design definitions** board, apply these rules
 ${designDefinitionsBody}`;
   });
 }
-const BRIEF_FILL_MODEL = process.env.AIDITOR_BRIEF_FILL_MODEL ?? "claude-sonnet-4-20250514";
+const briefFillModelOverride = process.env.AIDITOR_BRIEF_FILL_MODEL?.trim();
 const ALLOWED_IMAGE_MIMES = /* @__PURE__ */ new Set([
   "image/png",
   "image/jpeg",
@@ -2218,7 +2282,7 @@ async function runBriefFillAgentQuery(input) {
       maxTurns: BRIEF_FILL_MAX_TURNS,
       persistSession: false,
       systemPrompt,
-      model: BRIEF_FILL_MODEL,
+      ...briefFillModelOverride ? { model: briefFillModelOverride } : void 0,
       thinking: { type: "disabled" }
     }
   })) {
@@ -2867,6 +2931,41 @@ function resolveYarnAddInvocation(projectDir, spec) {
     cwd: resolvedProject
   };
 }
+function resolvePackageScriptInvocation(projectDir, scriptName) {
+  const resolvedProject = path.resolve(projectDir);
+  const workspaceRoot = findYarnWorkspaceRoot(resolvedProject);
+  const root = workspaceRoot ?? resolvedProject;
+  const runner = resolveYarnRunner(root);
+  const projectPkg = readPackageJson(resolvedProject);
+  const rootPkg = readPackageJson(root);
+  const usesYarn = Boolean(rootPkg?.packageManager?.startsWith("yarn@")) || fs$1.existsSync(path.join(root, "yarn.lock")) || fs$1.existsSync(path.join(resolvedProject, "yarn.lock"));
+  if (usesYarn) {
+    const useWorkspaceCommand = workspaceRoot !== void 0 && path.resolve(root) !== resolvedProject && hasYarnWorkspaces(rootPkg) && typeof projectPkg?.name === "string" && projectPkg.name.length > 0;
+    if (useWorkspaceCommand) {
+      return {
+        command: runner.command,
+        args: [
+          ...runner.prefixArgs,
+          "workspace",
+          projectPkg.name,
+          scriptName
+        ],
+        cwd: root
+      };
+    }
+    const args = runner.prefixArgs.length > 0 ? [...runner.prefixArgs, scriptName] : [scriptName];
+    return {
+      command: runner.command,
+      args,
+      cwd: resolvedProject
+    };
+  }
+  return {
+    command: "npm",
+    args: ["run", scriptName],
+    cwd: resolvedProject
+  };
+}
 function parseSemver(version) {
   const m = version.match(/^(\d+)\.(\d+)\.(\d+)/);
   if (!m) return null;
@@ -2885,6 +2984,57 @@ function isNewerSemver(latest, installed) {
   if (!a || !b) return false;
   return compareSemver(a, b) > 0;
 }
+async function* spawnCommandStream(command, args, cwd, options) {
+  const child = spawn(command, args, {
+    cwd,
+    shell: options?.shell ?? false,
+    env: process.env
+  });
+  const stdoutQueue = [];
+  const stderrQueue = [];
+  let closeCode = null;
+  let spawnError;
+  let notify;
+  const wake = () => notify?.();
+  child.stdout.on("data", (chunk) => {
+    const text = chunk.toString();
+    process.stdout.write(text);
+    stdoutQueue.push({ type: "stdout", text });
+    wake();
+  });
+  child.stderr.on("data", (chunk) => {
+    const text = chunk.toString();
+    process.stderr.write(text);
+    stderrQueue.push({ type: "stderr", text });
+    wake();
+  });
+  child.on("close", (code) => {
+    closeCode = code;
+    wake();
+  });
+  child.on("error", (err) => {
+    spawnError = err.message;
+    closeCode = 1;
+    wake();
+  });
+  while (closeCode === null || stdoutQueue.length > 0 || stderrQueue.length > 0) {
+    while (stdoutQueue.length > 0) {
+      yield stdoutQueue.shift();
+    }
+    while (stderrQueue.length > 0) {
+      yield stderrQueue.shift();
+    }
+    if (closeCode !== null) break;
+    await new Promise((resolve) => {
+      notify = resolve;
+    });
+    notify = void 0;
+  }
+  if (spawnError) {
+    yield { type: "stderr", text: spawnError };
+  }
+  yield { type: "close", code: closeCode };
+}
 async function spawnCommand(command, args, cwd, options) {
   return new Promise((resolve) => {
     const child = spawn(command, args, {
@@ -3642,6 +3792,71 @@ const writePluginSourceAction = makeJayQuery("aiditor.writePluginSource").withSe
   await writePluginSource(projectRoot, input);
   return { ok: true };
 });
+const AIDITOR_PUBLISH_SCRIPT = "aiditor:publish";
+async function projectHasAiditorPublishScript(projectRoot) {
+  try {
+    const raw = await fs.readFile(
+      path.join(projectRoot, "package.json"),
+      "utf-8"
+    );
+    const pkg = JSON.parse(raw);
+    const script = pkg.scripts?.[AIDITOR_PUBLISH_SCRIPT];
+    return typeof script === "string" && script.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+async function* streamAiditorPublishScript(projectRoot) {
+  const hasScript = await projectHasAiditorPublishScript(projectRoot);
+  if (!hasScript) {
+    yield {
+      type: "error",
+      message: `package.json is missing an "${AIDITOR_PUBLISH_SCRIPT}" script.`
+    };
+    return;
+  }
+  const inv = resolvePackageScriptInvocation(
+    projectRoot,
+    AIDITOR_PUBLISH_SCRIPT
+  );
+  const commandLabel = [inv.command, ...inv.args].join(" ");
+  yield {
+    type: "output",
+    stream: "stdout",
+    text: `> ${commandLabel}
+`
+  };
+  for await (const chunk of spawnCommandStream(inv.command, inv.args, inv.cwd, {
+    shell: inv.command === "npm"
+  })) {
+    if (chunk.type === "stdout" || chunk.type === "stderr") {
+      yield { type: "output", stream: chunk.type, text: chunk.text };
+      continue;
+    }
+    yield {
+      type: "complete",
+      success: chunk.code === 0,
+      code: chunk.code
+    };
+  }
+}
+const checkAiditorPublishAction = makeJayQuery(
+  "aiditor.checkAiditorPublish"
+).withHandler(async () => {
+  const projectRoot = process.cwd();
+  const hasPublishScript = await projectHasAiditorPublishScript(projectRoot);
+  return { hasPublishScript };
+});
+const runAiditorPublishAction = makeJayStream(
+  "aiditor.runAiditorPublish"
+).withHandler(async function* () {
+  const projectRoot = process.cwd();
+  for await (const chunk of streamAiditorPublishScript(projectRoot)) {
+    yield chunk;
+    if (chunk.type === "error") return;
+  }
+  yield { type: "done" };
+});
 const AIDITOR_ADD_MENU_DOC = "aiditor-add-menu.md";
 const INSTRUCTIONS_LINK_LINE = "- [Add Menu integration](./aiditor-add-menu.md) — contribute catalog items for AIditor";
 async function resolveTemplateDir(fromModuleUrl) {
@@ -3733,7 +3948,9 @@ const page = makeJayStackComponent().withProps();
 export {
   page as aiditorPage,
   aiditorShell,
+  cancelAgentTaskAction,
   checkAddPageRouteAction,
+  checkAiditorPublishAction,
   checkPageAddPageBriefAction,
   checkPluginUpdateAction,
   ensureProjectPluginAction,
@@ -3751,6 +3968,7 @@ export {
   reclassifyAddPageAssetAction,
   rerunPluginSetupAction,
   resolveAddMenuContractParamsAction,
+  runAiditorPublishAction,
   saveAddPageDraftAction,
   setupAiditor,
   startAddPageRequestAction,