@team-ai/teamai-cli 0.30.2 → 0.30.4

package/dist/cli.js

@@ -61809,49 +61809,26 @@ async function canonicalizeWorkspacePath(value) {
 }
 function mergeWorkspaceBindings(existing2, incoming, canonicalKey) {
   if (!existing2) return incoming;
-  const existingReal = existing2.projectId !== 0;
-  const incomingReal = incoming.projectId !== 0;
+  const rank2 = (binding) => binding.projectId > 0 ? 2 : binding.projectName === "__skipped__" ? 1 : 0;
+  const existingRank = rank2(existing2);
+  const incomingRank = rank2(incoming);
+  const existingReal = existingRank === 2;
+  const incomingReal = incomingRank === 2;
   if (existingReal && incomingReal && existing2.projectId !== incoming.projectId) {
     log.warn(
       `local-agent: workspace ${canonicalKey} has conflicting project bindings (${existing2.projectId} vs ${incoming.projectId}); keeping ${existing2.projectId}`
     );
   }
-  const base = existingReal || !incomingReal ? { ...existing2 } : { ...incoming };
+  const base = existingRank >= incomingRank ? { ...existing2 } : { ...incoming };
+  base.enrolledAt ??= existing2.enrolledAt ?? incoming.enrolledAt;
   if (!base.ideType) base.ideType = existing2.ideType ?? incoming.ideType;
   return base;
 }
-function workspaceEnrollmentsOf(config) {
-  return config.workspaceEnrollments ??= {};
+function isWorkspaceEnrolled(config, workspacePath) {
+  return config.workspaceBindings[workspacePath]?.enrolledAt !== void 0;
 }
-async function inferWorkspaceEnrollments(config) {
-  const inferred = {};
-  const add = async (workspacePath, enrolledAt = config.createdAt, ideType) => {
-    const canonical2 = await canonicalizeWorkspacePath(workspacePath);
-    inferred[canonical2] ??= { enrolledAt, ...ideType ? { ideType } : {} };
-  };
-  for (const [workspacePath, binding] of Object.entries(config.workspaceBindings)) {
-    if (binding.projectId > 0) await add(workspacePath, binding.boundAt, binding.ideType);
-  }
-  const manifest = await readJson(getManifestPath());
-  for (const key of Object.keys(manifest?.scopes ?? {})) {
-    const parsed = parseScopeKey(key);
-    if (parsed.scope === "project" && parsed.workspacePath) await add(parsed.workspacePath);
-  }
-  const models = await readJson(getModelManifestPath());
-  for (const workspacePath of Object.keys(models?.workspaceModels ?? {})) await add(workspacePath);
-  const projectHomes = await listDirs(path76.join(getTeamaiHomePath(), "projects")).catch(() => []);
-  const mcpOwnershipFiles = [
-    path76.join(getTeamaiHomePath(), "managed-local-mcp.json"),
-    ...projectHomes.map((dir) => path76.join(getTeamaiHomePath(), "projects", dir, "managed-local-mcp.json"))
-  ];
-  for (const file of mcpOwnershipFiles) {
-    const records2 = await readJson(file);
-    for (const [key, owned] of Object.entries(records2 ?? {})) {
-      const match = /^[^:]+:local:(.+)$/.exec(key);
-      if (match?.[1] && owned.length > 0) await add(match[1]);
-    }
-  }
-  return inferred;
+function hasWorkspaceBindingDecision(binding) {
+  return Boolean(binding && (binding.projectId > 0 || binding.projectName === "__skipped__"));
 }
 async function loadLocalAgentConfig(options2 = {}) {
   const fileConfig = await readJson(getConfigPath());
@@ -61860,14 +61837,8 @@ async function loadLocalAgentConfig(options2 = {}) {
     const config = {
       ...fileConfig,
       endpoint: normalizeEndpoint(fileConfig.endpoint),
-      workspaceEnrollments: fileConfig.workspaceEnrollments ?? {},
       workspaceBindings: fileConfig.workspaceBindings ?? {}
     };
-    let enrollmentMigrationChanged = false;
-    if (fileConfig.workspaceEnrollments === void 0) {
-      config.workspaceEnrollments = await inferWorkspaceEnrollments(config);
-      enrollmentMigrationChanged = true;
-    }
     const removedLegacyPaths = [];
     for (const [wsPath, binding] of Object.entries(config.workspaceBindings)) {
       if ("groupId" in binding && !("projectId" in binding)) {
@@ -61875,20 +61846,15 @@ async function loadLocalAgentConfig(options2 = {}) {
         removedLegacyPaths.push(wsPath);
       }
     }
+    let migrationChanged = removedLegacyPaths.length > 0;
     if (removedLegacyPaths.length > 0 && options2.dryRun) {
       log.info(`[dry-run] Would remove ${removedLegacyPaths.length} legacy group-based workspace binding(s).`);
     } else if (removedLegacyPaths.length > 0) {
       log.warn(
         `Removed ${removedLegacyPaths.length} legacy group-based workspace binding(s); you will be prompted to re-bind on the next session.`
       );
-      try {
-        await saveLocalAgentConfig(config);
-      } catch (e) {
-        log.debug(`local-agent: failed to persist binding cleanup: ${e.message}`);
-      }
     }
     const migrated = {};
-    let migrationChanged = false;
     for (const [wsPath, binding] of Object.entries(config.workspaceBindings)) {
       const canonicalKey = await canonicalizeWorkspacePath(wsPath);
       if (canonicalKey !== wsPath) migrationChanged = true;
@@ -61896,14 +61862,14 @@ async function loadLocalAgentConfig(options2 = {}) {
       migrated[canonicalKey] = mergeWorkspaceBindings(migrated[canonicalKey], binding, canonicalKey);
     }
     config.workspaceBindings = migrated;
-    const migratedEnrollments = {};
-    for (const [wsPath, enrollment] of Object.entries(config.workspaceEnrollments)) {
-      const canonicalKey = await canonicalizeWorkspacePath(wsPath);
-      if (canonicalKey !== wsPath || migratedEnrollments[canonicalKey]) migrationChanged = true;
-      migratedEnrollments[canonicalKey] ??= enrollment;
+    if (fileConfig.workspaceStateVersion !== 1) {
+      for (const binding of Object.values(config.workspaceBindings)) {
+        if (binding.projectId > 0) binding.enrolledAt ??= binding.boundAt;
+      }
+      config.workspaceStateVersion = 1;
+      migrationChanged = true;
     }
-    config.workspaceEnrollments = migratedEnrollments;
-    if ((migrationChanged || enrollmentMigrationChanged) && !options2.dryRun) {
+    if (migrationChanged && !options2.dryRun) {
       await saveLocalAgentConfig(config);
     }
     return config;
@@ -61918,7 +61884,7 @@ async function loadLocalAgentConfig(options2 = {}) {
       endpoint,
       token,
       createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-      workspaceEnrollments: {},
+      workspaceStateVersion: 1,
       workspaceBindings: {}
     };
     if (options2.dryRun) return backfilled;
@@ -61936,7 +61902,7 @@ async function loadLocalAgentConfig(options2 = {}) {
     endpoint: normalizeEndpoint(envEndpoint),
     token: process.env.TEAMAI_API_TOKEN ?? process.env.TEAMAI_TOKEN,
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-    workspaceEnrollments: {},
+    workspaceStateVersion: 1,
     workspaceBindings: {}
   };
 }
@@ -61944,7 +61910,7 @@ async function saveLocalAgentConfig(config) {
   await writeJsonAtomic(getConfigPath(), {
     ...config,
     endpoint: normalizeEndpoint(config.endpoint),
-    workspaceEnrollments: config.workspaceEnrollments ?? {},
+    workspaceStateVersion: 1,
     workspaceBindings: config.workspaceBindings ?? {}
   });
 }
@@ -62352,14 +62318,15 @@ async function persistWorkspaceBinding(config, cwd, resolvedPath, projectId, pro
   await saveLocalAgentConfig(config);
 }
 async function enrollWorkspace(config, resolvedPath) {
-  const enrollments = workspaceEnrollmentsOf(config);
-  enrollments[resolvedPath] ??= { enrolledAt: (/* @__PURE__ */ new Date()).toISOString() };
+  const enrolledAt = (/* @__PURE__ */ new Date()).toISOString();
+  const binding = config.workspaceBindings[resolvedPath];
+  config.workspaceBindings[resolvedPath] = binding ? { ...binding, enrolledAt: binding.enrolledAt ?? enrolledAt } : { projectId: 0, boundAt: enrolledAt, enrolledAt };
 }
 async function inheritWorktreeBinding(config, cwd, resolvedPath) {
   const anchors = await resolveAnchors(cwd);
   if (!anchors || anchors.projectAnchor === anchors.workspaceRoot) return false;
   const anchorBinding = config.workspaceBindings[anchors.projectAnchor];
-  if (!anchorBinding) return false;
+  if (!hasWorkspaceBindingDecision(anchorBinding)) return false;
   config.workspaceBindings[resolvedPath] = {
     ...config.workspaceBindings[resolvedPath],
     projectId: anchorBinding.projectId,
@@ -62374,7 +62341,7 @@ async function bindWorkspaceToProject(workspacePath, projectId) {
   if (!config) {
     throw new Error("HTTP local agent is not initialized. Run `teamai init --http <ENDPOINT> --token <API_TOKEN>` first.");
   }
-  if (!workspaceEnrollmentsOf(config)[workspacePath]) {
+  if (!isWorkspaceEnrolled(config, workspacePath)) {
     throw new Error(
       "Current workspace is not enrolled. Run `teamai init --http <ENDPOINT> --token <API_TOKEN>` here first."
     );
@@ -62392,8 +62359,8 @@ async function bindWorkspaceToProject(workspacePath, projectId) {
   return binding;
 }
 async function ensureWorkspaceBinding(config, workspacePath, sessionId, cwd) {
-  if (!workspaceEnrollmentsOf(config)[workspacePath]) return;
-  if (config.workspaceBindings[workspacePath]) return;
+  if (!isWorkspaceEnrolled(config, workspacePath)) return;
+  if (hasWorkspaceBindingDecision(config.workspaceBindings[workspacePath])) return;
   if (await inheritWorktreeBinding(config, cwd, workspacePath)) return;
   const markerKey = sessionId || `ppid-${process.ppid}`;
   const hintMarker = path76.join(os9.tmpdir(), `teamai-bind-session-${markerKey}`);
@@ -62441,8 +62408,8 @@ function isBindPromptTool(tool) {
   return kind === "codebuddy" || kind === "workbuddy";
 }
 async function emitBindingHint(config, workspacePath, sessionId, cwd) {
-  if (!workspaceEnrollmentsOf(config)[workspacePath]) return;
-  if (config.workspaceBindings[workspacePath]) return;
+  if (!isWorkspaceEnrolled(config, workspacePath)) return;
+  if (hasWorkspaceBindingDecision(config.workspaceBindings[workspacePath])) return;
   if (await inheritWorktreeBinding(config, cwd, workspacePath)) return;
   const markerKey = sessionId || `ppid-${process.ppid}`;
   const hintMarker = path76.join(os9.tmpdir(), `teamai-bind-hint-${markerKey}`);
@@ -62641,14 +62608,9 @@ async function scanModelsFromDisk(tool, workspacePath) {
 }
 async function pruneDeadWorkspaceBindings(config) {
   let changed = false;
-  const allPaths = /* @__PURE__ */ new Set([
-    ...Object.keys(config.workspaceBindings),
-    ...Object.keys(workspaceEnrollmentsOf(config))
-  ]);
-  for (const workspacePath of allPaths) {
+  for (const workspacePath of Object.keys(config.workspaceBindings)) {
     if (await isUserHomeDir(workspacePath)) {
       delete config.workspaceBindings[workspacePath];
-      delete workspaceEnrollmentsOf(config)[workspacePath];
       changed = true;
       continue;
     }
@@ -62657,7 +62619,6 @@ async function pruneDeadWorkspaceBindings(config) {
     } catch (error2) {
       if (error2.code === "ENOENT") {
         delete config.workspaceBindings[workspacePath];
-        delete workspaceEnrollmentsOf(config)[workspacePath];
         changed = true;
       } else {
         log.debug(
@@ -62670,26 +62631,18 @@ async function pruneDeadWorkspaceBindings(config) {
 }
 function stampWorkspaceTool(config, currentPath, tool) {
   if (!currentPath) return false;
-  const enrollment = workspaceEnrollmentsOf(config)[currentPath];
-  if (!enrollment) return false;
   const binding = config.workspaceBindings[currentPath];
+  if (!binding?.enrolledAt) return false;
   const normalized = normalizeAgentType(tool);
-  let changed = false;
-  if (enrollment.ideType !== normalized) {
-    enrollment.ideType = normalized;
-    changed = true;
-  }
-  if (binding && binding.ideType !== normalized) {
-    binding.ideType = normalized;
-    changed = true;
-  }
-  return changed;
+  if (binding.ideType === normalized) return false;
+  binding.ideType = normalized;
+  return true;
 }
 function selectToolWorkspaces(config, currentPath, currentTool) {
-  return Object.keys(workspaceEnrollmentsOf(config)).filter((wsPath) => {
-    const enrollment = workspaceEnrollmentsOf(config)[wsPath];
+  return Object.keys(config.workspaceBindings).filter((wsPath) => {
     const b2 = config.workspaceBindings[wsPath];
-    const wsTool = enrollment.ideType ?? b2?.ideType ?? (wsPath === currentPath ? currentTool : void 0);
+    if (!b2.enrolledAt) return false;
+    const wsTool = b2.ideType ?? (wsPath === currentPath ? currentTool : void 0);
     return wsTool === currentTool;
   });
 }
@@ -62751,7 +62704,7 @@ async function buildReportPayload(config, context) {
           name: path76.basename(wsPath),
           ide_type: currentTool
         };
-        if (wsBinding && wsBinding.projectId > 0) workspace.project_id = wsBinding.projectId;
+        if (wsBinding.projectId > 0) workspace.project_id = wsBinding.projectId;
         if (wsScope.skills.length > 0) workspace.skills = wsScope.skills;
         if (wsScope.rules.length > 0) workspace.rules = wsScope.rules;
         const wsMcps = await scanMcpFromManifest("project", tool, wsPath);
@@ -62780,7 +62733,7 @@ async function buildSyncPayload(config, context) {
         path: wsPath,
         name: path76.basename(wsPath),
         ide_type: currentTool,
-        ...wsBinding && wsBinding.projectId > 0 ? { project_id: wsBinding.projectId } : {}
+        ...wsBinding.projectId > 0 ? { project_id: wsBinding.projectId } : {}
       };
     });
   }
@@ -63852,7 +63805,7 @@ async function applyModelConfig(config, command, context) {
   if (scope === "project" && !workspacePath) {
     throw new Error("apply_model_config: workspace command is missing workspace_path");
   }
-  if (workspacePath && workspaceEnrollmentsOf(config)[workspacePath] === void 0) {
+  if (workspacePath && !isWorkspaceEnrolled(config, workspacePath)) {
     throw new Error(
       `apply_model_config: workspace "${path76.basename(workspacePath)}" is not enrolled`
     );
@@ -64377,7 +64330,7 @@ async function executeCommand(config, command, context) {
   if (normalizeScope(command.scope) === "project") {
     const workspacePath2 = await resolveWorkspacePath(command.workspace_path ?? context.cwd);
     if (!workspacePath2) throw new Error(`${command.type ?? "workspace command"} is missing workspace_path`);
-    if (!workspaceEnrollmentsOf(config)[workspacePath2]) {
+    if (!isWorkspaceEnrolled(config, workspacePath2)) {
       throw new Error(`Workspace is not enrolled for TeamAI management: ${workspacePath2}`);
     }
     if (command.project_id !== void 0) {
@@ -64472,7 +64425,7 @@ async function syncLocalAgent(context) {
   if (!config) return false;
   const workspacePath = await resolveWorkspacePath(context.cwd);
   if (isBindPromptEnabled() && isBindPromptTool(context.tool)) {
-    if (workspacePath && workspaceEnrollmentsOf(config)[workspacePath]) {
+    if (workspacePath && isWorkspaceEnrolled(config, workspacePath)) {
       const sid = context.event?.sessionId;
       if (context.event?.type === "session_start") {
         await ensureWorkspaceBinding(config, workspacePath, sid, context.cwd);
@@ -64674,7 +64627,7 @@ async function initLocalAgentHttp(options2) {
     endpoint,
     token: options2.token ?? existing2?.token,
     createdAt: existing2?.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-    workspaceEnrollments: existing2?.workspaceEnrollments ?? {},
+    workspaceStateVersion: 1,
     workspaceBindings: existing2?.workspaceBindings ?? {},
     userGroupId: existing2?.userGroupId,
     userGroupName: existing2?.userGroupName
@@ -64922,18 +64875,12 @@ async function bindCurrentProject(options2) {
     if (!config) {
       throw new Error("Local agent not initialized. Run `teamai init --http` first.");
     }
-    if (!workspaceEnrollmentsOf(config)[workspacePath]) {
+    if (!isWorkspaceEnrolled(config, workspacePath)) {
       throw new Error(
         "Current workspace is not enrolled. Run `teamai init --http <ENDPOINT> --token <API_TOKEN>` here first."
       );
     }
-    await persistWorkspaceBinding(
-      config,
-      options2?.cwd ?? process.cwd(),
-      workspacePath,
-      0,
-      "__skipped__"
-    );
+    await persistWorkspaceBinding(config, options2?.cwd ?? process.cwd(), workspacePath, 0, "__skipped__");
     log.info(`\u5DF2\u8DF3\u8FC7\u7ED1\u5B9A\uFF0C\u4EE5\u540E\u4E0D\u518D\u63D0\u793A\u6B64\u5DE5\u4F5C\u533A\u3002`);
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-ai/teamai-cli",
-  "version": "0.30.2",
+  "version": "0.30.4",
   "description": "TeamAI — Make Every Team AI Native (skill sync + shared knowledge base, powered by Git)",
   "type": "module",
   "bin": {