toga-ai 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toga-ai",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "TOGA Technology Team Claude Knowledge System — shared AI coding harness with skills, knowledge base CLI, and project installer for Claude Code.",
   "keywords": [
     "claude",

package/scripts/install.js

@@ -462,17 +462,17 @@ function main() {
   console.log('toga-ai — TOGA Technology Claude harness');
   console.log('═════════════════════════════════════════════');
 
-  // Step 1: npm bundle is always the baseline source
-  let sourceDir = PACKAGE_ROOT;
-  let sourceLabel = 'npm bundle v' + bundleVersion;
+  // Harness components (skills/agents/rules/hooks) ALWAYS come from the npm bundle.
+  // The git repo is ONLY used to pull newer knowledge docs on top — it never
+  // replaces harness components, so a stale local clone can't break the install.
+  const harnessDir = PACKAGE_ROOT;
+  let knowledgeDir = PACKAGE_ROOT;  // overridden below if git repo found
   let gitUpdateLine = null;
 
-  // Step 2: find or try to clone git repo for updates
   if (repoFlag) {
     const resolved = path.resolve(repoFlag);
     if (isValidClone(resolved)) {
-      sourceDir = resolved;
-      sourceLabel = 'git repo (--repo flag)';
+      knowledgeDir = resolved;
     } else {
       console.error('  ERROR: --repo path is not a valid clone: ' + resolved);
       process.exit(1);
@@ -481,40 +481,37 @@ function main() {
     let repoDir = findExistingClone();
 
     if (!repoDir && !isPostInstall) {
-      // Try to clone silently — no error if it fails
       repoDir = tryCloneRepo(path.join(os.homedir(), 'toga-tech'));
     }
 
     if (repoDir) {
-      // Pull latest — silent on failure, just use bundle
       const pullResult = tryGitPull(repoDir);
       saveRepoPathCache(repoDir);
 
       if (pullResult.pulled) {
-        sourceDir = repoDir;
-        sourceLabel = 'npm bundle v' + bundleVersion;
+        knowledgeDir = repoDir;
         if (pullResult.newDocs > 0) {
           gitUpdateLine = 'git update: pulled ' + pullResult.newDocs + ' new knowledge doc' + (pullResult.newDocs !== 1 ? 's' : '') + ' from TOGATechnology/claude';
-        } else {
+        } else if (pullResult.message !== 'already up to date') {
           gitUpdateLine = 'git update: ' + pullResult.message;
         }
       } else if (isValidClone(repoDir)) {
-        // Pull failed but repo exists — still use it as source
-        sourceDir = repoDir;
-        sourceLabel = 'git repo (offline, using cached)';
+        // Pull failed but repo exists — use cached knowledge only
+        knowledgeDir = repoDir;
       }
-      // else: pull failed and can't use repo — silently stick with bundle
     }
-    // No git access at all — silently use bundle
   }
 
-  console.log('  Source: ' + sourceLabel);
-  if (gitUpdateLine) {
+  console.log('  Harness: npm bundle v' + bundleVersion);
+  if (knowledgeDir !== PACKAGE_ROOT) {
+    console.log('  Knowledge: git repo' + (gitUpdateLine ? ' (' + gitUpdateLine.replace('git update: ', '') + ')' : ' (cached)'));
+  }
+  if (gitUpdateLine && knowledgeDir === PACKAGE_ROOT) {
     console.log('  ↳ ' + gitUpdateLine);
   }
   console.log('');
 
-  if (isPostInstall && sourceDir === PACKAGE_ROOT && !repoFlag) {
+  if (isPostInstall && !repoFlag) {
     console.log('  First-time setup: run `toga-ai` from your project to');
     console.log('  install the harness into your .claude/ directory.');
     console.log('');
@@ -535,7 +532,7 @@ function main() {
   const errors = [];
 
   // Skills
-  const skillsSrc = path.join(sourceDir, 'skills');
+  const skillsSrc = path.join(harnessDir, 'skills');
   const skillsDest = path.join(claudeDir, 'skills');
   fs.mkdirSync(skillsDest, { recursive: true });
   const skillNames = fs.existsSync(skillsSrc)
@@ -552,7 +549,7 @@ function main() {
   console.log('  ✓ Skills    (' + skillNames.length + '): ' + fmtStats(skillStats));
 
   // Rules — update if content changed (team standards should always be current)
-  const rulesSrc = path.join(sourceDir, 'rules');
+  const rulesSrc = path.join(harnessDir, 'rules');
   const rulesDest = path.join(claudeDir, 'rules', 'toga');
   let rulesStats = { added: 0, updated: 0, unchanged: 0 };
   if (fs.existsSync(rulesSrc)) {
@@ -562,7 +559,7 @@ function main() {
   console.log('  ✓ Rules     (' + countMd(rulesDest) + '): ' + fmtStats(rulesStats));
 
   // Agents — update if content changed
-  const agentsSrc = path.join(sourceDir, 'agents');
+  const agentsSrc = path.join(harnessDir, 'agents');
   const agentsDest = path.join(claudeDir, 'agents', 'toga');
   let agentsStats = { added: 0, updated: 0, unchanged: 0 };
   if (fs.existsSync(agentsSrc)) {
@@ -573,7 +570,7 @@ function main() {
   console.log('  ✓ Agents    (' + agentsCount + '): ' + fmtStats(agentsStats));
 
   // Hook scripts — always overwrite so paths stay up to date
-  const hooksSrc = path.join(sourceDir, 'scripts', 'hooks');
+  const hooksSrc = path.join(harnessDir, 'scripts', 'hooks');
   const hooksDest = path.join(claudeDir, 'hooks', 'toga');
   let hooksCount = 0;
   if (fs.existsSync(hooksSrc)) {
@@ -584,18 +581,18 @@ function main() {
   }
 
   // knowledge.js CLI — always overwrite so it stays current
-  const knowledgeJsSrc = path.join(sourceDir, 'knowledge.js');
+  const knowledgeJsSrc = path.join(harnessDir, 'knowledge.js');
   if (fs.existsSync(knowledgeJsSrc)) {
     try { fs.copyFileSync(knowledgeJsSrc, path.join(claudeDir, 'knowledge.js')); }
     catch (e) { errors.push('knowledge.js: ' + e.message); }
   }
 
   // Settings — merge (additive only, never removes existing hooks or permissions)
-  const ok = mergeSettings(claudeDir, sourceDir);
+  const ok = mergeSettings(claudeDir, harnessDir);
   console.log('  ' + (ok ? '✓' : '✗') + ' Hooks     (' + hooksCount + ' scripts in .claude/hooks/toga/, settings.json merged)');
 
   // MCP example — skip if already present
-  const mcpSrc = path.join(sourceDir, 'mcp-configs', 'mcp-servers.json');
+  const mcpSrc = path.join(harnessDir, 'mcp-configs', 'mcp-servers.json');
   const mcpDest = path.join(claudeDir, 'mcp-servers.example.json');
   if (fs.existsSync(mcpSrc) && !fs.existsSync(mcpDest)) {
     try { fs.copyFileSync(mcpSrc, mcpDest); }
@@ -603,8 +600,9 @@ function main() {
     console.log('  ✓ MCP       (.claude/mcp-servers.example.json — merge into .mcp.json to enable)');
   }
 
-  // Knowledge — skipExisting: user-grown docs are never overwritten by the bundle
-  const knowledgeSrc = path.join(sourceDir, 'knowledge');
+  // Knowledge — git repo if available (has team-captured docs), else npm bundle
+  // skipExisting: user-grown docs are never overwritten
+  const knowledgeSrc = path.join(knowledgeDir, 'knowledge');
   const knowledgeDest = path.join(claudeDir, 'knowledge');
   let knowledgeStats = { added: 0, updated: 0, unchanged: 0 };
   if (fs.existsSync(knowledgeSrc)) {
@@ -614,7 +612,7 @@ function main() {
   console.log('  ✓ Knowledge (' + countMd(knowledgeDest) + ' docs): ' + fmtStats(knowledgeStats));
 
   // CLAUDE.md
-  const action = updateClaudeMd(projectRoot, skillNames, sourceDir, sourceLabel);
+  const action = updateClaudeMd(projectRoot, skillNames, harnessDir, 'npm bundle v' + bundleVersion);
   console.log('  ✓ CLAUDE.md ' + action);
 
   // ECC global integration — detect and report