@thinkingai/ae-cli 1.0.28 → 6.0.16

package/dist/{model-EZ6K7FXI.js → model-SJSOZTRS.js}

@@ -2,17 +2,15 @@ import {
   MultiselectCancelled,
   getCurrentWorkspace,
   promptSingleCheckboxSelect
-} from "./chunk-IMBKVXKY.js";
+} from "./chunk-EGEIXA2Z.js";
 import {
   TeAgentApiError,
+  TeAgentCredentialsError,
+  getClaudeConfigDir,
   getSandboxModels,
   postSandboxModelSelection
-} from "./chunk-AD5V3ZPJ.js";
-import {
-  TeAgentCredentialsError,
-  getClaudeConfigDir
-} from "./chunk-KAEZTSXN.js";
-import "./chunk-SRJIAOBN.js";
+} from "./chunk-I5CRVM2S.js";
+import "./chunk-6W4QOZAL.js";
 
 // src/commands/model/index.ts
 import { existsSync, readFileSync } from "fs";

package/dist/{raw-VEF3D6UD.js → raw-7NVWSVJP.js}

@@ -1,18 +1,18 @@
 import {
   printError,
   printOutput
-} from "./chunk-CLJF7MQA.js";
+} from "./chunk-2DUEAXV3.js";
 import {
   httpGet,
   httpPost
-} from "./chunk-LU7SXK4Q.js";
+} from "./chunk-BJX3GXWC.js";
 import {
   SecureStoreAuthError,
   resolveHost
-} from "./chunk-CAQYQA4R.js";
+} from "./chunk-RSHMZ3LG.js";
 import {
   safeJsonParse
-} from "./chunk-SRJIAOBN.js";
+} from "./chunk-6W4QOZAL.js";
 
 // src/api/raw.ts
 function registerApi(program) {

package/dist/{sync-NRODEVNH.js → sync-GRVO4K3U.js}

@@ -1,6 +1,8 @@
 import {
   MultiselectCancelled,
   SKILL_MANIFEST_FILE,
+  assertValidMcpName,
+  assertValidSkillSlug,
   describeSource,
   getCurrentWorkspace,
   promptMultiselect,
@@ -8,21 +10,20 @@ import {
   readSkillManifestEntries,
   scanMcps,
   scanSkills,
+  splitPushableMcps,
   writeSkillManifestEntries
-} from "./chunk-IMBKVXKY.js";
+} from "./chunk-EGEIXA2Z.js";
 import {
   TeAgentApiError,
+  TeAgentCredentialsError,
   getSandboxSyncPullCandidates,
   postSandboxSyncPull,
   postToMainApp
-} from "./chunk-AD5V3ZPJ.js";
-import {
-  TeAgentCredentialsError
-} from "./chunk-KAEZTSXN.js";
+} from "./chunk-I5CRVM2S.js";
 import {
   printError
-} from "./chunk-CLJF7MQA.js";
-import "./chunk-SRJIAOBN.js";
+} from "./chunk-2DUEAXV3.js";
+import "./chunk-6W4QOZAL.js";
 
 // src/commands/sync/index.ts
 import Table from "cli-table3";
@@ -32,16 +33,54 @@ import {
   cpSync,
   existsSync,
   mkdirSync,
+  readFileSync,
   realpathSync,
   rmSync,
-  statSync
+  statSync,
+  writeFileSync
 } from "fs";
 import path from "path";
-var SKILL_SLUG_RE = /^[a-z0-9-]+$/;
-function updateSkillManifestForSource(sourceDir, slug) {
-  if (!SKILL_SLUG_RE.test(slug)) {
-    throw new Error(`Invalid Skill slug: ${slug}`);
+var MCP_MANIFEST_FILE = ".mcp-manifest.json";
+function isMcpScope(value) {
+  return value === "personal" || value === "company" || value === "system";
+}
+function uniqueMcpEntries(entries) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const entry of entries) {
+    if (seen.has(entry.name)) continue;
+    seen.add(entry.name);
+    out.push(entry);
   }
+  return out;
+}
+function readMcpManifestEntries(manifestPath) {
+  if (!existsSync(manifestPath)) return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(manifestPath, "utf8"));
+  } catch {
+    return [];
+  }
+  if (!Array.isArray(parsed)) return [];
+  const entries = [];
+  for (const item of parsed) {
+    if (!item || typeof item !== "object") continue;
+    const entry = item;
+    if (typeof entry.name !== "string" || !isMcpScope(entry.scope)) continue;
+    entries.push({ name: entry.name, scope: entry.scope });
+  }
+  return uniqueMcpEntries(entries);
+}
+function writeMcpManifestEntries(manifestPath, entries) {
+  writeFileSync(
+    manifestPath,
+    JSON.stringify(uniqueMcpEntries(entries), null, 2) + "\n",
+    "utf8"
+  );
+}
+function updateSkillManifestForSource(sourceDir, slug) {
+  assertValidSkillSlug(slug);
   const sourceAbs = path.resolve(sourceDir);
   if (!statSync(sourceAbs).isDirectory()) {
     throw new Error(`Skill source path is not a directory: ${sourceDir}`);
@@ -62,10 +101,30 @@ function updateSkillManifestForSource(sourceDir, slug) {
   writeSkillManifestEntries(manifestPath, nextManifest);
   return { manifestPath, changed: true };
 }
-function copySkillPackageToTarget(args) {
-  if (!SKILL_SLUG_RE.test(args.slug)) {
-    throw new Error(`Invalid Skill slug: ${args.slug}`);
+function updateMcpManifestForProjectSource(workspaceDir, name) {
+  assertValidMcpName(name);
+  const workspaceAbs = path.resolve(workspaceDir);
+  if (!statSync(workspaceAbs).isDirectory()) {
+    throw new Error(`MCP workspace path is not a directory: ${workspaceDir}`);
+  }
+  const manifestPath = path.join(workspaceAbs, MCP_MANIFEST_FILE);
+  const manifest = readMcpManifestEntries(manifestPath);
+  const nextEntry = { name, scope: "personal" };
+  const existingIndex = manifest.findIndex((entry) => entry.name === name);
+  if (existingIndex >= 0 && manifest[existingIndex].scope === nextEntry.scope) {
+    return { manifestPath, changed: false };
+  }
+  const nextManifest = manifest.slice();
+  if (existingIndex >= 0) {
+    nextManifest[existingIndex] = nextEntry;
+  } else {
+    nextManifest.push(nextEntry);
   }
+  writeMcpManifestEntries(manifestPath, nextManifest);
+  return { manifestPath, changed: true };
+}
+function copySkillPackageToTarget(args) {
+  assertValidSkillSlug(args.slug);
   if (!path.isAbsolute(args.targetRoot)) {
     throw new Error(`skillTargetRoot must be an absolute path: ${args.targetRoot}`);
   }
@@ -103,6 +162,13 @@ function redactEnv(env) {
   }
   return out;
 }
+var SOURCE_ORDER = {
+  global: 0,
+  workspace: 1,
+  project: 0,
+  local: 1,
+  user: 2
+};
 function skillToItem(s) {
   return {
     kind: "skill",
@@ -124,6 +190,7 @@ function mcpToItem(m, includeSecrets) {
     scope: "personal",
     source: m.source,
     workspacePath: m.workspacePath,
+    workspaceDir: m.workspaceDir,
     event: "upsert",
     transport: m.transport,
     url: m.url,
@@ -140,7 +207,7 @@ async function selectSkills() {
     return [];
   }
   all.sort((a, b) => {
-    if (a.source !== b.source) return a.source === "global" ? -1 : 1;
+    if (a.source !== b.source) return SOURCE_ORDER[a.source] - SOURCE_ORDER[b.source];
     return a.slug.localeCompare(b.slug);
   });
   const items = all.map((s) => ({
@@ -158,11 +225,21 @@ async function selectMcps(includeSecrets) {
     process.stderr.write("No MCPs found (scanned current workspace .mcp.json / .claude/.claude.json and global ~/.claude.json)\n");
     return [];
   }
-  all.sort((a, b) => {
-    if (a.source !== b.source) return a.source === "global" ? -1 : 1;
+  const { supported, unsupportedStdio } = splitPushableMcps(all);
+  if (unsupportedStdio.length > 0) {
+    const names = unsupportedStdio.map((m) => m.slug).sort().join(", ");
+    process.stderr.write(`ae-cli sync push only supports http/sse MCPs; skipped stdio MCPs: ${names}
+`);
+  }
+  if (supported.length === 0) {
+    process.stderr.write("No syncable MCPs found. ae-cli sync push only supports http/sse.\n");
+    return [];
+  }
+  supported.sort((a, b) => {
+    if (a.source !== b.source) return SOURCE_ORDER[a.source] - SOURCE_ORDER[b.source];
     return a.slug.localeCompare(b.slug);
   });
-  const items = all.map((m) => ({
+  const items = supported.map((m) => ({
     value: m,
     label: m.slug,
     group: describeSource(m),
@@ -212,7 +289,7 @@ function toHttpItems(items) {
       const { kind: _kind2, dirPath: _dirPath, ...rest2 } = item;
       return rest2;
     }
-    const { kind: _kind, ...rest } = item;
+    const { kind: _kind, workspaceDir: _workspaceDir, ...rest } = item;
     return rest;
   });
 }
@@ -266,6 +343,26 @@ function copySyncedSkillPackages(skillItems, resp) {
     }
   }
 }
+function updateSyncedProjectMcpManifest(mcpItems, resp) {
+  if (mcpItems.length === 0) return;
+  const bySlug = new Map(mcpItems.map((item) => [item.slug, item]));
+  for (const result of resp.results) {
+    if (result.kind !== "mcp" || result.status !== "synced") continue;
+    const item = bySlug.get(result.slug);
+    if (!item || item.source !== "project") continue;
+    if (!item.workspaceDir) {
+      result.status = "failed";
+      result.message = "Main app synced the MCP, but local MCP manifest update failed: missing workspaceDir";
+      continue;
+    }
+    try {
+      updateMcpManifestForProjectSource(item.workspaceDir, item.slug);
+    } catch (err) {
+      result.status = "failed";
+      result.message = `Main app synced the MCP, but local MCP manifest update failed: ${err?.message ?? String(err)}`;
+    }
+  }
+}
 async function selectDirection(optsDirection) {
   if (optsDirection === "push" || optsDirection === "pull") return optsDirection;
   if (optsDirection) {
@@ -310,6 +407,7 @@ async function runPush(kind, includeSecrets) {
   }
   if (mcpItems.length > 0) {
     const mcpResp = await pushItems("mcp", mcpItems);
+    updateSyncedProjectMcpManifest(mcpItems, mcpResp);
     allResults.push(...mcpResp.results);
   }
   renderResults(allResults);
@@ -333,7 +431,7 @@ async function runPull(kind) {
   });
   const skillItems = kind !== "mcp" ? await selectPullResources({
     title: "Select Skills to sync to workspace",
-    candidates: candidates.skills ?? []
+    candidates: (candidates.skills ?? []).filter((candidate) => candidate.scope !== "system")
   }) : [];
   const mcpItems = kind !== "skill" ? await selectPullResources({
     title: "Select MCPs to sync to workspace",
@@ -349,8 +447,7 @@ async function runPull(kind) {
     workspacePath: workspace.name,
     kind,
     skills: skillItems.map((item) => item.id),
-    mcp: mcpItems.map((item) => item.id),
-    ifUnmodifiedSince: candidates.mtime
+    mcp: mcpItems.map((item) => item.id)
   });
   renderResults(pullResultRows(resp));
 }