teamai-cli 0.20.0-beta.4 → 0.20.0-beta.6

package/dist/index.js

@@ -218,6 +218,7 @@ __export(types_exports, {
   areTeamHooksDisabled: () => areTeamHooksDisabled,
   emptyTokenUsage: () => emptyTokenUsage,
   getConfigPath: () => getConfigPath,
+  getEnvBackupPath: () => getEnvBackupPath,
   getHooksSharing: () => getHooksSharing,
   getKnowledgeDir: () => getKnowledgeDir,
   getManagedHooksPath: () => getManagedHooksPath,
@@ -313,6 +314,10 @@ function getTeamaiHome(scope, projectRoot) {
   }
   return path2.join(process.env.HOME ?? "", ".teamai");
 }
+function getEnvBackupPath(localConfig) {
+  const home = getTeamaiHome(localConfig.scope, localConfig.projectRoot);
+  return path2.join(home, isSelfMode(localConfig) ? "env.local" : "env");
+}
 function getConfigPath(scope, projectRoot) {
   return path2.join(getTeamaiHome(scope, projectRoot), "config.yaml");
 }
@@ -8004,6 +8009,20 @@ var init_env = __esm({
        * Compares local env/env.yaml against the committed version.
        */
       async scanLocalForPush(_teamConfig, localConfig) {
+        if (isSelfMode(localConfig) && localConfig.projectRoot) {
+          const activeEnv = path25.join(localConfig.projectRoot, ".teamai", "env", "env.yaml");
+          if (!await pathExists(activeEnv)) return [];
+          const baseEnv = path25.join(localConfig.repo.localPath, "env", "env.yaml");
+          if (await pathExists(baseEnv) && await fileContentEqual(activeEnv, baseEnv)) {
+            return [];
+          }
+          return [{
+            name: "env.yaml",
+            type: "env",
+            sourcePath: activeEnv,
+            relativePath: "env/env.yaml"
+          }];
+        }
         const envYamlPath = path25.join(localConfig.repo.localPath, "env", "env.yaml");
         if (!await pathExists(envYamlPath)) return [];
         const { execFile: execFile5 } = await import("child_process");
@@ -8036,7 +8055,15 @@ var init_env = __esm({
           relativePath: "env/env.yaml"
         }];
       }
-      async pushItem(_item, _teamConfig, _localConfig) {
+      async pushItem(item, _teamConfig, localConfig) {
+        if (isSelfMode(localConfig)) {
+          const dest = path25.join(localConfig.repo.localPath, "env", "env.yaml");
+          if (item.sourcePath !== dest) {
+            await ensureDir(path25.dirname(dest));
+            const content = await readFileSafe(item.sourcePath);
+            if (content !== null) await writeFile(dest, content);
+          }
+        }
       }
       /**
        * Pull env variables: parse env.yaml, write env.sh, inject source line into shell profile.
@@ -8056,7 +8083,7 @@ var init_env = __esm({
         const teamaiHome = getTeamaiHome(localConfig.scope, localConfig.projectRoot);
         const backupLines = envConfig.variables.map((v) => `${v.key}=${v.value}`);
         await ensureDir(teamaiHome);
-        await writeFile(path25.join(teamaiHome, "env"), backupLines.join("\n") + "\n");
+        await writeFile(getEnvBackupPath(localConfig), backupLines.join("\n") + "\n");
         const envShContent = this.generateEnvFile(envConfig.variables);
         await writeFile(path25.join(teamaiHome, "env.sh"), envShContent);
         const inject = teamConfig.sharing.env.injectShellProfile !== false;
@@ -8568,6 +8595,34 @@ var init_agents = __esm({
         const teamAgentsDir = path28.join(localConfig.repo.localPath, "agents");
         const tombstones = await this.readTombstones(localConfig);
         const baseDir = resolveBaseDir(localConfig);
+        const directItems = [];
+        const directStems = /* @__PURE__ */ new Set();
+        if (isSelfMode(localConfig) && localConfig.projectRoot) {
+          const activeAgentsDir = path28.join(localConfig.projectRoot, ".teamai", "agents");
+          if (await pathExists(activeAgentsDir)) {
+            for (const file of await listFiles(activeAgentsDir)) {
+              const isYaml = file.endsWith(".yaml");
+              const isMd = file.endsWith(".md");
+              if (!isYaml && !isMd) continue;
+              const stem = file.replace(/\.(yaml|md)$/, "");
+              if (tombstones.has(stem)) continue;
+              if (BUILTIN_AGENT_NAMES.has(stem)) continue;
+              const activePath = path28.join(activeAgentsDir, file);
+              const basePath = path28.join(teamAgentsDir, file);
+              const baseExists = await pathExists(basePath);
+              if (baseExists && await fileContentEqual(activePath, basePath)) continue;
+              directItems.push({
+                name: stem,
+                type: "agents",
+                sourcePath: activePath,
+                relativePath: `agents/${file}`,
+                status: baseExists ? "modified" : "new",
+                legacy: isMd
+              });
+              directStems.add(stem);
+            }
+          }
+        }
         const grouped = /* @__PURE__ */ new Map();
         for (const [tool, toolPath] of Object.entries(teamConfig.toolPaths)) {
           if (!toolPath.agents) continue;
@@ -8579,6 +8634,7 @@ var init_agents = __esm({
             if (stem === null) continue;
             if (tombstones.has(stem)) continue;
             if (BUILTIN_AGENT_NAMES.has(stem)) continue;
+            if (directStems.has(stem)) continue;
             const filePath = path28.join(agentsDir, file);
             let toolGroup = grouped.get(stem);
             if (!toolGroup) {
@@ -8590,7 +8646,7 @@ var init_agents = __esm({
             }
           }
         }
-        const items = [];
+        const items = [...directItems];
         for (const [stem, toolFiles] of grouped) {
           const teamYamlPath = path28.join(teamAgentsDir, `${stem}.yaml`);
           const teamMdPath = path28.join(teamAgentsDir, `${stem}.md`);
@@ -8722,12 +8778,13 @@ var init_agents = __esm({
           log.debug(`Wrote agent ${item.name} \u2192 team repo (YAML format)`);
           return;
         }
-        const dest = path28.join(localConfig.repo.localPath, "agents", `${item.name}.md`);
+        const ext = item.sourcePath.endsWith(".yaml") ? ".yaml" : ".md";
+        const dest = path28.join(localConfig.repo.localPath, "agents", `${item.name}${ext}`);
         if (item.sourcePath !== dest) {
           await ensureDir(path28.dirname(dest));
           await copyFile(item.sourcePath, dest);
         }
-        log.debug(`Copied agent ${item.name} \u2192 team repo (legacy MD format)`);
+        log.debug(`Copied agent ${item.name} \u2192 team repo (${ext} verbatim)`);
       }
       /**
        * Pull an agent to every installed tool's agents/ directory.
@@ -9619,6 +9676,11 @@ async function push(options) {
   const { localConfig, teamConfig } = await autoDetectInit();
   assertNotReadOnly(localConfig, "teamai push");
   if (localConfig.repo.kind === "self") {
+    try {
+      const { migrateSelfModeGitignore: migrateSelfModeGitignore2 } = await Promise.resolve().then(() => (init_init(), init_exports));
+      await migrateSelfModeGitignore2(localConfig);
+    } catch {
+    }
     const { withKnowledgeWorktree: withKnowledgeWorktree2, EmptyRepoError: EmptyRepoError2 } = await Promise.resolve().then(() => (init_reports_branch(), reports_branch_exports));
     try {
       await withKnowledgeWorktree2(localConfig, (wtConfig) => pushCore(wtConfig, teamConfig, options));
@@ -10788,6 +10850,8 @@ __export(init_exports, {
   init: () => init,
   initHttp: () => initHttp,
   initSelfRepo: () => initSelfRepo,
+  migrateSelfModeGitignore: () => migrateSelfModeGitignore,
+  migrateSelfModeGitignoreContent: () => migrateSelfModeGitignoreContent,
   promptForSelfModeAgents: () => promptForSelfModeAgents,
   resolveInheritUserScope: () => resolveInheritUserScope,
   resolveInitRepo: () => resolveInitRepo,
@@ -11053,8 +11117,14 @@ function buildSelfModeGitignore() {
     ".update-lock",
     ".reports-lock",
     ".bootstrap-lock",
-    "env",
+    // NB: env/ is intentionally NOT ignored in single-repo mode — team env vars
+    // (.teamai/env/env.yaml) are committed to main so `teamai push` can carry them
+    // and teammates get them on clone. env.yaml holds plaintext key/value pairs, so
+    // only put non-secret config there; keep real secrets out of the repo.
     "env.sh",
+    // env.local is the machine-local KEY=value backup pull writes for ${VAR}
+    // resolution (self mode uses this name to avoid colliding with the env/ dir).
+    "env.local",
     "usage.jsonl",
     "known-skills.json",
     "search-index.json",
@@ -11073,6 +11143,45 @@ function buildSelfModeGitignore() {
     ""
   ].join("\n");
 }
+function migrateSelfModeGitignoreContent(content) {
+  const lines = content.split("\n");
+  let changed = false;
+  const filtered = lines.filter((line) => {
+    if (line.trim() === "env") {
+      changed = true;
+      return false;
+    }
+    return true;
+  });
+  const hasEnvLocal = filtered.some((l) => l.trim() === "env.local");
+  if (!hasEnvLocal) {
+    const envShIdx = filtered.findIndex((l) => l.trim() === "env.sh");
+    if (envShIdx >= 0) {
+      filtered.splice(envShIdx + 1, 0, "env.local");
+    } else {
+      const lastNonEmpty = filtered.reduce((acc, l, i) => l.trim() ? i : acc, -1);
+      filtered.splice(lastNonEmpty + 1, 0, "env.local");
+    }
+    changed = true;
+  }
+  return { changed, content: filtered.join("\n") };
+}
+async function migrateSelfModeGitignore(localConfig) {
+  if (localConfig.repo.kind !== "self" || !localConfig.projectRoot) return;
+  const gitignorePath = path38.join(localConfig.projectRoot, ".teamai", ".gitignore");
+  try {
+    const current = await readFileSafe(gitignorePath);
+    if (current === null) return;
+    const { changed, content } = migrateSelfModeGitignoreContent(current);
+    if (!changed) return;
+    await writeFile(gitignorePath, content);
+    log.info(
+      "Updated .teamai/.gitignore so team env vars (.teamai/env/env.yaml) can be shared \u2014 please `git add .teamai/.gitignore` and commit it."
+    );
+  } catch (e) {
+    log.debug(`[self-mode] gitignore migration skipped: ${e.message}`);
+  }
+}
 function resolveSelfModeSelection(indices, detected) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -11193,7 +11302,7 @@ async function initSelfRepo(options) {
     return;
   }
   await ensureDir(localPath);
-  for (const dir of ["skills", "rules", "docs", "learnings", "env"]) {
+  for (const dir of ["skills", "rules", "docs", "learnings", "env", "agents", "hooks", "mcp"]) {
     await ensureDir(path38.join(localPath, dir));
     const gitkeep = path38.join(localPath, dir, ".gitkeep");
     if (!await pathExists(gitkeep)) {
@@ -11270,6 +11379,10 @@ async function initSelfRepo(options) {
         ".teamai/rules",
         ".teamai/docs",
         ".teamai/learnings",
+        ".teamai/env",
+        ".teamai/agents",
+        ".teamai/hooks",
+        ".teamai/mcp",
         ".teamai/teamai.yaml",
         ".teamai/.gitignore"
       ];
@@ -11322,8 +11435,18 @@ async function initSelfRepo(options) {
   } catch {
   }
   log.success("teamai initialized (single-repo mode)!");
-  log.info("Push your business repo (e.g. `git push -u origin HEAD`) so teammates get the .teamai/ knowledge and are auto-initialized on clone.");
-  log.info("Add skills/rules later with `teamai push` \u2014 it opens a PR against your repo without touching your working tree.");
+  log.info("Next steps:");
+  log.info("  1. Add team resources by dropping them into .teamai/ (or author them in your AI tool as usual):");
+  log.info("       .teamai/skills/    team skills");
+  log.info("       .teamai/rules/     shared rules");
+  log.info("       .teamai/agents/    subagent definitions (<name>.yaml)");
+  log.info("       .teamai/env/env.yaml   shared env vars \u2014 committed to main, so keep real secrets out");
+  log.info("  2. Run `teamai push` for the above \u2014 it scans .teamai/{skills,rules,agents,env} plus your AI tool dirs and opens a PR against your repo, without touching your working tree.");
+  log.info("  3. docs / hooks / mcp are edited directly and shipped with a normal commit \u2014 no push needed:");
+  log.info("       .teamai/docs/          team docs");
+  log.info("       .teamai/hooks/hooks.yaml   team hooks");
+  log.info("       .teamai/mcp/mcp.yaml       shared MCP servers");
+  log.info("  4. Push your business repo (e.g. `git push -u origin HEAD`) so teammates get the .teamai/ knowledge and are auto-initialized on clone.");
   closePrompt();
 }
 async function init(options) {
@@ -14256,7 +14379,7 @@ async function readManifest2(manifestPath) {
 }
 async function buildVarTable(localConfig) {
   const table = {};
-  const envFile = path47.join(getTeamaiHome(localConfig.scope, localConfig.projectRoot), "env");
+  const envFile = getEnvBackupPath(localConfig);
   const content = await readFileSafe(envFile);
   if (content) {
     for (const line of content.split("\n")) {
@@ -14571,6 +14694,11 @@ async function refreshTeamRepo(localConfig) {
     return { label: "HTTP (report/sync delivery)", version: null, reportingOnly: true };
   }
   if (localConfig.repo.kind === "self") {
+    try {
+      const { migrateSelfModeGitignore: migrateSelfModeGitignore2 } = await Promise.resolve().then(() => (init_init(), init_exports));
+      await migrateSelfModeGitignore2(localConfig);
+    } catch {
+    }
     let version3 = null;
     try {
       version3 = await getHeadRev(localConfig.repo.localPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "teamai-cli",
-  "version": "0.20.0-beta.4",
+  "version": "0.20.0-beta.6",
   "description": "TeamAI — the team harness for AI agents (skill sync + shared knowledge base, powered by Git)",
   "type": "module",
   "bin": {