octocode-cli 1.2.5 → 1.2.6

package/README.md

@@ -41,19 +41,27 @@ npx octocode-cli
 ## 📦 Installation & Usage
 
 ### Interactive Mode
+
 The recommended way to use Octocode CLI. Access all features through a unified menu:
-- **Octocode Configuration**: Setup MCP servers and GitHub auth.
-- **Manage System Skills**: Install AI capabilities.
-- **Manage System MCP**: Sync configs and browse the marketplace.
+
+| Menu Item | Description |
+|-----------|-------------|
+| **🐙 Octocode MCP** | Install and configure Octocode MCP for your IDEs |
+| **🐙 Octocode Skills** | Install AI-powered research, planning & review skills |
+| **🧠 Manage System Skills** | Browse skills marketplace and manage installed skills |
+| **🔑 Manage Auth** | Sign in/out via Octocode OAuth or gh CLI |
+| **⚡ Manage System MCP** | Sync configs, browse MCP marketplace, inspect settings |
 
 ```bash
 npx octocode-cli
 ```
 
 ### CLI Commands
+
 For automation and power users, Octocode CLI offers a comprehensive command-line interface.
 
 #### 1. Install Octocode MCP
+
 Install the GitHub MCP server for your preferred IDE.
 
 ```bash
@@ -64,56 +72,82 @@ octocode-cli install
 octocode-cli install --ide cursor --method npx
 octocode-cli install --ide claude-desktop --method direct
 octocode-cli install --ide windsurf
+octocode-cli install --ide zed
 ```
 
+**Supported IDEs**: `cursor`, `claude-desktop`, `claude-code`, `windsurf`, `zed`, `vscode-cline`, `vscode-roo`, `vscode-continue`, `opencode`, `trae`, `antigravity`
+
 #### 2. Manage Authentication
+
 Securely authenticate with GitHub. Credentials are encrypted (AES-256-GCM) and stored in `~/.octocode/`.
 
 ```bash
-# Interactive login
+# Interactive login (OAuth device flow)
 octocode-cli login
 
-# Check status
+# Check authentication status
 octocode-cli status
 
 # Enterprise Login
 octocode-cli login --hostname github.mycompany.com
+
+# Sign out
+octocode-cli logout
+
+# Auth management menu
+octocode-cli auth
 ```
 
-#### 3. Sync Configurations
+#### 3. Get GitHub Token
+
+Retrieve tokens for scripting or debugging.
+
+```bash
+# Get token (auto: env → gh → octocode)
+octocode-cli token
+
+# Get token from specific source
+octocode-cli token --type=octocode
+octocode-cli token --type=gh
+
+# Show token source and user info
+octocode-cli token --source
+
+# JSON output for scripting
+octocode-cli token --json
+```
+
+#### 4. Sync Configurations
+
 Keep your MCP settings consistent across different editors.
 
 ```bash
 # Sync all IDEs
 octocode-cli sync
 
-# Preview changes
+# Preview changes (dry run)
 octocode-cli sync --dry-run
+
+# Show sync status
+octocode-cli sync --status
+
+# Force sync (auto-resolve conflicts)
+octocode-cli sync --force
 ```
 
-#### 4. Manage Skills
+#### 5. Manage Skills
+
 Install AI skills for Claude Code.
 
 ```bash
 # List available skills
 octocode-cli skills list
 
-# Install all standard skills
+# Install all skills
 octocode-cli skills install
-```
 
-#### 5. Additional Commands
-Other useful commands for power users.
-
-```bash
-# Logout from GitHub
-octocode-cli logout
-
-# Get GitHub token (for scripting)
-octocode-cli token
-
-# Auth management menu
-octocode-cli auth
+# Force reinstall (overwrite existing)
+octocode-cli skills install --force
 ```
 
 ---

package/out/octocode-cli.js

@@ -79,7 +79,12 @@ class TimeoutError extends Error {
 async function withTimeout(promise, ms) {
   return Promise.race([
     promise,
-    new Promise((_, reject) => setTimeout(() => reject(new TimeoutError(`Operation timed out after ${ms}ms`)), ms))
+    new Promise(
+      (_, reject) => setTimeout(
+        () => reject(new TimeoutError(`Operation timed out after ${ms}ms`)),
+        ms
+      )
+    )
   ]);
 }
 let _keychainAvailable = null;
@@ -99,8 +104,7 @@ const credentialsCache = /* @__PURE__ */ new Map();
 const CACHE_TTL_MS$1 = 5 * 60 * 1e3;
 function isCacheValid$1(hostname) {
   const cached = credentialsCache.get(hostname);
-  if (!cached)
-    return false;
+  if (!cached) return false;
   const age = Date.now() - cached.cachedAt;
   return age < CACHE_TTL_MS$1;
 }
@@ -156,20 +160,17 @@ async function keychainStore(hostname, credentials) {
   await setPassword(KEYCHAIN_SERVICE, hostname, data);
 }
 async function keychainGet(hostname) {
-  if (!checkKeychainAvailable())
-    return null;
+  if (!checkKeychainAvailable()) return null;
   try {
     const data = await getPassword(KEYCHAIN_SERVICE, hostname);
-    if (!data)
-      return null;
+    if (!data) return null;
     return JSON.parse(data);
   } catch {
     return null;
   }
 }
 async function keychainDelete(hostname) {
-  if (!checkKeychainAvailable())
-    return false;
+  if (!checkKeychainAvailable()) return false;
   try {
     return await deletePassword(KEYCHAIN_SERVICE, hostname);
   } catch {
@@ -223,7 +224,9 @@ function readCredentialsStore() {
     const decrypted = decrypt(encryptedContent);
     return JSON.parse(decrypted);
   } catch (error) {
-    console.error("\n  ⚠ Warning: Could not read credentials file. You may need to login again.");
+    console.error(
+      "\n  ⚠ Warning: Could not read credentials file. You may need to login again."
+    );
     console.error(`  File: ${CREDENTIALS_FILE}`);
     if (error instanceof Error && error.message) {
       console.error(`  Reason: ${error.message}
@@ -251,7 +254,9 @@ function removeFromFileStorage(hostname) {
     }
     return false;
   } catch (err) {
-    console.warn(`[token-storage] Failed to remove from file storage: ${err instanceof Error ? err.message : String(err)}`);
+    console.warn(
+      `[token-storage] Failed to remove from file storage: ${err instanceof Error ? err.message : String(err)}`
+    );
     return false;
   }
 }
@@ -285,12 +290,17 @@ async function storeCredentials(credentials) {
   };
   if (isSecureStorageAvailable()) {
     try {
-      await withTimeout(keychainStore(hostname, normalizedCredentials), KEYRING_TIMEOUT_MS);
+      await withTimeout(
+        keychainStore(hostname, normalizedCredentials),
+        KEYRING_TIMEOUT_MS
+      );
       removeFromFileStorage(hostname);
       invalidateCredentialsCache(hostname);
       return { success: true, insecureStorageUsed: false };
     } catch (err) {
-      console.warn(`[token-storage] Keyring storage failed, using file fallback: ${err instanceof Error ? err.message : String(err)}`);
+      console.warn(
+        `[token-storage] Keyring storage failed, using file fallback: ${err instanceof Error ? err.message : String(err)}`
+      );
     }
   }
   try {
@@ -301,7 +311,9 @@ async function storeCredentials(credentials) {
     return { success: true, insecureStorageUsed: true };
   } catch (fileError) {
     console.error(`[token-storage] CRITICAL: All storage methods failed!`);
-    console.error(`  Error: ${fileError instanceof Error ? fileError.message : String(fileError)}`);
+    console.error(
+      `  Error: ${fileError instanceof Error ? fileError.message : String(fileError)}`
+    );
     throw new Error("Failed to store credentials");
   }
 }
@@ -324,12 +336,16 @@ async function getCredentials(hostname = "github.com", options) {
 async function fetchCredentialsFromStorage(normalizedHostname) {
   if (isSecureStorageAvailable()) {
     try {
-      const creds = await withTimeout(keychainGet(normalizedHostname), KEYRING_TIMEOUT_MS);
-      if (creds)
-        return creds;
+      const creds = await withTimeout(
+        keychainGet(normalizedHostname),
+        KEYRING_TIMEOUT_MS
+      );
+      if (creds) return creds;
     } catch (err) {
       if (!(err instanceof TimeoutError)) {
-        console.warn(`[token-storage] Keyring read failed: ${err instanceof Error ? err.message : String(err)}`);
+        console.warn(
+          `[token-storage] Keyring read failed: ${err instanceof Error ? err.message : String(err)}`
+        );
       }
     }
   }
@@ -355,9 +371,14 @@ async function deleteCredentials(hostname = "github.com") {
   let deletedFromFile = false;
   if (isSecureStorageAvailable()) {
     try {
-      deletedFromKeyring = await withTimeout(keychainDelete(normalizedHostname), KEYRING_TIMEOUT_MS);
+      deletedFromKeyring = await withTimeout(
+        keychainDelete(normalizedHostname),
+        KEYRING_TIMEOUT_MS
+      );
     } catch (err) {
-      console.warn(`[token-storage] Keyring delete failed: ${err instanceof Error ? err.message : String(err)}`);
+      console.warn(
+        `[token-storage] Keyring delete failed: ${err instanceof Error ? err.message : String(err)}`
+      );
     }
   }
   const store = readCredentialsStore();
@@ -7843,18 +7864,18 @@ defineLazyProperty(apps, "safari", () => detectPlatformBinary({
   darwin: "Safari"
 }));
 const SKILLS_MARKETPLACES = [
-  // === OFFICIAL BUNDLED SKILLS ===
+  // === OCTOCODE SKILLS ===
   {
-    id: "octocode-official",
-    name: "🐙 Octocode Official",
-    type: "local",
-    owner: "ArekSrorth",
+    id: "octocode-skills",
+    name: "Octocode Skills",
+    type: "github",
+    owner: "bgauryy",
     repo: "octocode-mcp",
     branch: "main",
-    skillsPath: "packages/octocode-cli/skills",
+    skillsPath: "skills",
     skillPattern: "skill-folders",
-    description: "Official research, planning, review & roast skills",
-    url: "https://github.com/ArekSrorth/octocode-mcp"
+    description: "Research, planning, implementation & PR review skills",
+    url: "https://github.com/bgauryy/octocode-mcp/tree/main/skills"
   },
   // === COMMUNITY MARKETPLACES ===
   {
@@ -8472,7 +8493,7 @@ async function installSkill(skill) {
 }
 async function showOfficialFlowMenu(totalSkills, notInstalledCount) {
   console.log();
-  console.log(`  ${bold("Octocode Official Skills")}`);
+  console.log(`  ${bold("🐙 Octocode Skills")}`);
   console.log(`  ${dim(`${totalSkills} skills available`)}`);
   console.log();
   const choices = [];
@@ -8634,69 +8655,17 @@ async function runMarketplaceFlow() {
     }
   }
 }
-async function installAllOctocodeSkills() {
-  const source = SKILLS_MARKETPLACES.find((s) => s.id === "octocode-official");
-  if (!source) {
-    return {
-      installed: 0,
-      alreadyInstalled: 0,
-      failed: 0,
-      allInstalled: false
-    };
-  }
-  let skills;
-  try {
-    skills = await fetchMarketplaceSkills(source);
-  } catch {
-    return {
-      installed: 0,
-      alreadyInstalled: 0,
-      failed: 0,
-      allInstalled: false
-    };
-  }
-  if (skills.length === 0) {
-    return { installed: 0, alreadyInstalled: 0, failed: 0, allInstalled: true };
-  }
-  const destDir = getSkillsDestDir();
-  const skillsToInstall = skills.filter((skill) => !isSkillInstalled(skill.name));
-  const alreadyInstalled = skills.length - skillsToInstall.length;
-  if (skillsToInstall.length === 0) {
-    return {
-      installed: 0,
-      alreadyInstalled,
-      failed: 0,
-      allInstalled: true
-    };
-  }
-  let installed = 0;
-  let failed = 0;
-  for (const skill of skillsToInstall) {
-    const result = await installMarketplaceSkill(skill, destDir);
-    if (result.success) {
-      installed++;
-    } else {
-      failed++;
-    }
-  }
-  return {
-    installed,
-    alreadyInstalled,
-    failed,
-    allInstalled: failed === 0
-  };
-}
-async function runOctocodeOfficialFlow() {
-  const source = SKILLS_MARKETPLACES.find((s) => s.id === "octocode-official");
+async function runOctocodeSkillsFlow() {
+  const source = SKILLS_MARKETPLACES.find((s) => s.id === "octocode-skills");
   if (!source) {
     console.log();
-    console.log(`  ${c("red", "✗")} Octocode Official source not found`);
+    console.log(`  ${c("red", "✗")} Octocode Skills source not found`);
     console.log();
     await pressEnterToContinue$2();
     return;
   }
   console.log();
-  const spinner = new Spinner(`Loading ${source.name}...`).start();
+  const spinner = new Spinner(`Loading Octocode Skills...`).start();
   let skills;
   try {
     skills = await fetchMarketplaceSkills(source);
@@ -8721,8 +8690,8 @@ async function runOctocodeOfficialFlow() {
   const notInstalledCount = skills.filter(
     (s) => !isSkillInstalled(s.name)
   ).length;
-  let inOfficialFlow = true;
-  while (inOfficialFlow) {
+  let inFlow = true;
+  while (inFlow) {
     const menuChoice = await showOfficialFlowMenu(
       skills.length,
       notInstalledCount
@@ -8730,7 +8699,7 @@ async function runOctocodeOfficialFlow() {
     switch (menuChoice) {
       case "install-all":
         await installAllSkills(skills);
-        inOfficialFlow = false;
+        inFlow = false;
         break;
       case "browse": {
         let inSkillsBrowser = true;
@@ -8749,7 +8718,7 @@ async function runOctocodeOfficialFlow() {
       }
       case "back":
       default:
-        inOfficialFlow = false;
+        inFlow = false;
         break;
     }
   }
@@ -8861,11 +8830,6 @@ async function showSkillsMenu(installedCount) {
       description: "View, remove, or inspect individual skills"
     });
   }
-  choices.push({
-    name: "🐙 Octocode Official 📦",
-    value: "octocode-official",
-    description: "Research, PR review, local search & more"
-  });
   choices.push({
     name: "🌐 Browse Marketplace",
     value: "marketplace",
@@ -9145,9 +9109,6 @@ async function runSkillsMenu() {
       case "manage":
         await manageInstalledSkills();
         break;
-      case "octocode-official":
-        await runOctocodeOfficialFlow();
-        break;
       case "marketplace":
         await runMarketplaceFlow();
         break;
@@ -9802,6 +9763,23 @@ function buildSkillsMenuItem(skills) {
     description: `${c("cyan", "→")} Install skills for AI-powered coding workflows`
   };
 }
+function buildOctocodeSkillsMenuItem(skills) {
+  const octocodeSkillsInstalled = skills.skills.filter(
+    (s) => s.name.startsWith("octocode-") && s.installed
+  ).length;
+  if (octocodeSkillsInstalled > 0) {
+    return {
+      name: `🐙 Octocode Skills ${c("green", "✓")}`,
+      value: "octocode-skills",
+      description: `${octocodeSkillsInstalled} installed • Research, planning & review`
+    };
+  }
+  return {
+    name: "🐙 Octocode Skills",
+    value: "octocode-skills",
+    description: "Install AI-powered research, planning & review skills"
+  };
+}
 function getAuthSourceDisplay(auth2) {
   switch (auth2.tokenSource) {
     case "gh-cli":
@@ -9893,10 +9871,7 @@ function printContextualHints(state) {
     c("yellow", `     ▸ Prompts:  Use /research, /plan, /implement in chat`)
   );
   console.log(
-    c(
-      "yellow",
-      `     ▸ Skills:   Add all via Manage System Skills → Octocode Official`
-    )
+    c("yellow", `     ▸ Skills:   Add via 🐙 Octocode Skills in main menu`)
   );
   console.log(
     c(
@@ -9923,6 +9898,7 @@ async function showMainMenu(state) {
   printContextualHints(state);
   const choices = [];
   choices.push(buildOctocodeMenuItem(state));
+  choices.push(buildOctocodeSkillsMenuItem(state.skills));
   choices.push(buildSkillsMenuItem(state.skills));
   choices.push(buildAuthMenuItem(state.githubAuth));
   choices.push({
@@ -9978,14 +9954,6 @@ async function showOctocodeMenu(state) {
       description: "Server options & preferences"
     });
   }
-  if (!state.skills.allInstalled && state.skills.hasSkills) {
-    const notInstalled = state.skills.skills.filter((s) => !s.installed).length;
-    choices.push({
-      name: `🧠 Install All Skills ${c("cyan", `(${notInstalled} available)`)}`,
-      value: "install-skills",
-      description: "One-click install of all Octocode skills"
-    });
-  }
   choices.push(
     new Separator()
   );
@@ -10032,45 +10000,6 @@ async function runOctocodeFlow() {
         await runConfigOptionsFlow();
         console.log();
         break;
-      case "install-skills": {
-        console.log();
-        const skillsSpinner = new Spinner(
-          "Installing all Octocode skills..."
-        ).start();
-        const result = await installAllOctocodeSkills();
-        if (result.installed > 0) {
-          skillsSpinner.succeed(
-            `Installed ${result.installed} skill${result.installed !== 1 ? "s" : ""}!`
-          );
-          console.log();
-          console.log(
-            `  ${c("green", "✓")} ${result.installed} skill${result.installed !== 1 ? "s" : ""} installed successfully`
-          );
-          if (result.alreadyInstalled > 0) {
-            console.log(
-              `  ${dim(`(${result.alreadyInstalled} already installed)`)}`
-            );
-          }
-          if (result.failed > 0) {
-            console.log(
-              `  ${c("yellow", "⚠")} ${result.failed} skill${result.failed !== 1 ? "s" : ""} failed to install`
-            );
-          }
-          console.log();
-          console.log(`  ${bold("Skills are now available in Claude Code!")}`);
-        } else if (result.allInstalled) {
-          skillsSpinner.succeed("All skills already installed!");
-          console.log();
-          console.log(`  ${c("green", "✓")} All Octocode skills are installed`);
-        } else {
-          skillsSpinner.fail("Failed to install skills");
-          console.log();
-          console.log(`  ${c("red", "✗")} Could not install skills`);
-        }
-        console.log();
-        await pressEnterToContinue();
-        break;
-      }
       case "back":
       default:
         inMenu = false;
@@ -10505,6 +10434,9 @@ async function handleMenuChoice(choice) {
     case "octocode":
       await runOctocodeFlow();
       return true;
+    case "octocode-skills":
+      await runOctocodeSkillsFlow();
+      return true;
     case "skills":
       await runSkillsMenu();
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octocode-cli",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Interactive CLI installer for octocode-mcp - Configure MCP servers for Cursor, Claude Desktop, and more",
   "keywords": [
     "octocode",
@@ -33,13 +33,13 @@
     "@octokit/auth-oauth-device": "^8.0.3",
     "@octokit/oauth-methods": "^6.0.2",
     "@octokit/request": "^10.0.7",
+    "octocode-shared": "1.0.0",
     "open": "^11.0.0"
   },
   "devDependencies": {
     "@types/node": "^22.15.29",
     "@vitest/coverage-v8": "^4.0.16",
     "eslint": "^9.18.0",
-    "octocode-shared": "workspace:^",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.0",

package/skills/octocode-implement/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: octocode-implement-with-contect
+name: octocode-implement
 description: Implement features from spec documents (context/doc required)
 ---