panopticon-cli 0.3.3 → 0.3.4

package/README.md

@@ -342,20 +342,27 @@ Cloister manages specialized agents that handle specific phases of the developme
 
 #### Merge Agent Workflow
 
-The merge-agent is a specialist that handles the entire PR merge process:
+The merge-agent is a specialist that handles **ALL** merges, not just conflicts. This ensures:
+- It sees all code changes coming through the pipeline
+- It builds context about the codebase over time
+- When conflicts DO occur, it has better understanding for intelligent resolution
+- Tests are always run before completing the merge
+
+**Workflow:**
 
 1. **Pull latest main** - Ensures local main is up-to-date
-2. **Merge main into feature branch** - Brings in any changes from main
-3. **Resolve conflicts** - Uses AI to resolve merge conflicts intelligently
-4. **Run tests** - Verifies the merge didn't break anything
-5. **Push changes** - Pushes the resolved merge
-6. **Create/Update PR** - Creates a PR if one doesn't exist
-7. **Merge PR** - Merges the PR using `gh pr merge`
+2. **Analyze incoming changes** - Reviews what the feature branch contains
+3. **Perform merge** - Merges feature branch into main
+4. **Resolve conflicts** - If conflicts exist, uses AI to resolve them intelligently
+5. **Run tests** - Verifies the merge didn't break anything
+6. **Commit merge** - Commits the merge with descriptive message
+7. **Report results** - Returns success/failure with details
 
 **Triggering merge-agent:**
 
 ```bash
 # Via dashboard - click "Approve & Merge" on an issue card
+# merge-agent is ALWAYS invoked, regardless of whether conflicts exist
 
 # Via CLI
 pan specialists wake merge-agent --issue MIN-123
@@ -363,9 +370,9 @@ pan specialists wake merge-agent --issue MIN-123
 
 The merge-agent uses a specialized prompt template that instructs it to:
 - Never force-push
-- Always run tests before merging
+- Always run tests before completing
 - Document conflict resolution decisions
-- Update the issue status on success
+- Provide detailed feedback on what was merged
 
 #### Specialist Auto-Initialization
 

package/dist/{chunk-IVAFJ6DS.js → chunk-BH6BR26M.js}

@@ -1,6 +1,6 @@
 import {
   PANOPTICON_HOME
-} from "./chunk-3SI436SZ.js";
+} from "./chunk-P5TQ5C3J.js";
 
 // src/lib/projects.ts
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "fs";
@@ -170,4 +170,4 @@ export {
   createDefaultProjectsConfig,
   initializeProjectsConfig
 };
-//# sourceMappingURL=chunk-IVAFJ6DS.js.map
+//# sourceMappingURL=chunk-BH6BR26M.js.map

package/dist/{chunk-ZT55DPAC.js → chunk-C6A7S65K.js}

@@ -7,7 +7,7 @@ import {
   SKILLS_DIR,
   SOURCE_SCRIPTS_DIR,
   SYNC_TARGETS
-} from "./chunk-3SI436SZ.js";
+} from "./chunk-P5TQ5C3J.js";
 
 // src/lib/config.ts
 import { readFileSync, writeFileSync, existsSync } from "fs";
@@ -1445,4 +1445,4 @@ export {
   LinkManager,
   getLinkManager
 };
-//# sourceMappingURL=chunk-ZT55DPAC.js.map
+//# sourceMappingURL=chunk-C6A7S65K.js.map

package/dist/{chunk-3SI436SZ.js → chunk-P5TQ5C3J.js}

@@ -3,7 +3,7 @@ import { homedir } from "os";
 import { join } from "path";
 import { fileURLToPath } from "url";
 import { dirname } from "path";
-var PANOPTICON_HOME = join(homedir(), ".panopticon");
+var PANOPTICON_HOME = process.env.PANOPTICON_HOME || join(homedir(), ".panopticon");
 var CONFIG_DIR = PANOPTICON_HOME;
 var SKILLS_DIR = join(PANOPTICON_HOME, "skills");
 var COMMANDS_DIR = join(PANOPTICON_HOME, "commands");
@@ -100,4 +100,4 @@ export {
   SOURCE_SCRIPTS_DIR,
   INIT_DIRS
 };
-//# sourceMappingURL=chunk-3SI436SZ.js.map
+//# sourceMappingURL=chunk-P5TQ5C3J.js.map

package/dist/chunk-P5TQ5C3J.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/lib/paths.ts"],"sourcesContent":["import { homedir } from 'os';\nimport { join } from 'path';\n\n// Panopticon home directory (can be overridden for testing)\nexport const PANOPTICON_HOME = process.env.PANOPTICON_HOME || join(homedir(), '.panopticon');\n\n// Subdirectories\nexport const CONFIG_DIR = PANOPTICON_HOME;\nexport const SKILLS_DIR = join(PANOPTICON_HOME, 'skills');\nexport const COMMANDS_DIR = join(PANOPTICON_HOME, 'commands');\nexport const AGENTS_DIR = join(PANOPTICON_HOME, 'agents');\nexport const BIN_DIR = join(PANOPTICON_HOME, 'bin');\nexport const BACKUPS_DIR = join(PANOPTICON_HOME, 'backups');\nexport const COSTS_DIR = join(PANOPTICON_HOME, 'costs');\nexport const HEARTBEATS_DIR = join(PANOPTICON_HOME, 'heartbeats');\n\n// Traefik directories\nexport const TRAEFIK_DIR = join(PANOPTICON_HOME, 'traefik');\nexport const TRAEFIK_DYNAMIC_DIR = join(TRAEFIK_DIR, 'dynamic');\nexport const TRAEFIK_CERTS_DIR = join(TRAEFIK_DIR, 'certs');\n\n// Legacy certs directory (for backwards compatibility)\nexport const CERTS_DIR = join(PANOPTICON_HOME, 'certs');\n\n// Config files\nexport const CONFIG_FILE = join(CONFIG_DIR, 'config.toml');\n\n// AI tool directories\nexport const CLAUDE_DIR = join(homedir(), '.claude');\nexport const CODEX_DIR = join(homedir(), '.codex');\nexport const CURSOR_DIR = join(homedir(), '.cursor');\nexport const GEMINI_DIR = join(homedir(), '.gemini');\n\n// Target sync locations\nexport const SYNC_TARGETS = {\n  claude: {\n    skills: join(CLAUDE_DIR, 'skills'),\n    commands: join(CLAUDE_DIR, 'commands'),\n    agents: join(CLAUDE_DIR, 'agents'),\n  },\n  codex: {\n    skills: join(CODEX_DIR, 'skills'),\n    commands: join(CODEX_DIR, 'commands'),\n    agents: join(CODEX_DIR, 'agents'),\n  },\n  cursor: {\n    skills: join(CURSOR_DIR, 'skills'),\n    commands: join(CURSOR_DIR, 'commands'),\n    agents: join(CURSOR_DIR, 'agents'),\n  },\n  gemini: {\n    skills: join(GEMINI_DIR, 'skills'),\n    commands: join(GEMINI_DIR, 'commands'),\n    agents: join(GEMINI_DIR, 'agents'),\n  },\n} as const;\n\nexport type Runtime = keyof typeof SYNC_TARGETS;\n\n// Templates directory (in user's ~/.panopticon)\nexport const TEMPLATES_DIR = join(PANOPTICON_HOME, 'templates');\nexport const CLAUDE_MD_TEMPLATES = join(TEMPLATES_DIR, 'claude-md', 'sections');\n\n// Source templates directory (bundled with the package)\n// This is resolved at runtime from the package root\nimport { fileURLToPath } from 'url';\nimport { dirname } from 'path';\n\nconst currentFile = fileURLToPath(import.meta.url);\nconst currentDir = dirname(currentFile);\n\n// Handle both development (src/lib/) and production (dist/) modes\n// In dev: /path/to/panopticon/src/lib/paths.ts -> /path/to/panopticon\n// In prod: /path/to/panopticon/dist/lib/paths.js -> /path/to/panopticon\nlet packageRoot: string;\nif (currentDir.includes('/src/')) {\n  // Development mode - go up from src/lib to package root\n  packageRoot = dirname(dirname(currentDir));\n} else {\n  // Production mode - go up from dist (or dist/lib) to package root\n  packageRoot = currentDir.endsWith('/lib')\n    ? dirname(dirname(currentDir))\n    : dirname(currentDir);\n}\n\nexport const SOURCE_TEMPLATES_DIR = join(packageRoot, 'templates');\nexport const SOURCE_TRAEFIK_TEMPLATES = join(SOURCE_TEMPLATES_DIR, 'traefik');\nexport const SOURCE_SCRIPTS_DIR = join(packageRoot, 'scripts');\n\n// All directories to create on init\nexport const INIT_DIRS = [\n  PANOPTICON_HOME,\n  SKILLS_DIR,\n  COMMANDS_DIR,\n  AGENTS_DIR,\n  BIN_DIR,\n  BACKUPS_DIR,\n  COSTS_DIR,\n  HEARTBEATS_DIR,\n  TEMPLATES_DIR,\n  CLAUDE_MD_TEMPLATES,\n  CERTS_DIR,\n  TRAEFIK_DIR,\n  TRAEFIK_DYNAMIC_DIR,\n  TRAEFIK_CERTS_DIR,\n];\n"],"mappings":";AAAA,SAAS,eAAe;AACxB,SAAS,YAAY;AAgErB,SAAS,qBAAqB;AAC9B,SAAS,eAAe;AA9DjB,IAAM,kBAAkB,QAAQ,IAAI,mBAAmB,KAAK,QAAQ,GAAG,aAAa;AAGpF,IAAM,aAAa;AACnB,IAAM,aAAa,KAAK,iBAAiB,QAAQ;AACjD,IAAM,eAAe,KAAK,iBAAiB,UAAU;AACrD,IAAM,aAAa,KAAK,iBAAiB,QAAQ;AACjD,IAAM,UAAU,KAAK,iBAAiB,KAAK;AAC3C,IAAM,cAAc,KAAK,iBAAiB,SAAS;AACnD,IAAM,YAAY,KAAK,iBAAiB,OAAO;AAC/C,IAAM,iBAAiB,KAAK,iBAAiB,YAAY;AAGzD,IAAM,cAAc,KAAK,iBAAiB,SAAS;AACnD,IAAM,sBAAsB,KAAK,aAAa,SAAS;AACvD,IAAM,oBAAoB,KAAK,aAAa,OAAO;AAGnD,IAAM,YAAY,KAAK,iBAAiB,OAAO;AAG/C,IAAM,cAAc,KAAK,YAAY,aAAa;AAGlD,IAAM,aAAa,KAAK,QAAQ,GAAG,SAAS;AAC5C,IAAM,YAAY,KAAK,QAAQ,GAAG,QAAQ;AAC1C,IAAM,aAAa,KAAK,QAAQ,GAAG,SAAS;AAC5C,IAAM,aAAa,KAAK,QAAQ,GAAG,SAAS;AAG5C,IAAM,eAAe;AAAA,EAC1B,QAAQ;AAAA,IACN,QAAQ,KAAK,YAAY,QAAQ;AAAA,IACjC,UAAU,KAAK,YAAY,UAAU;AAAA,IACrC,QAAQ,KAAK,YAAY,QAAQ;AAAA,EACnC;AAAA,EACA,OAAO;AAAA,IACL,QAAQ,KAAK,WAAW,QAAQ;AAAA,IAChC,UAAU,KAAK,WAAW,UAAU;AAAA,IACpC,QAAQ,KAAK,WAAW,QAAQ;AAAA,EAClC;AAAA,EACA,QAAQ;AAAA,IACN,QAAQ,KAAK,YAAY,QAAQ;AAAA,IACjC,UAAU,KAAK,YAAY,UAAU;AAAA,IACrC,QAAQ,KAAK,YAAY,QAAQ;AAAA,EACnC;AAAA,EACA,QAAQ;AAAA,IACN,QAAQ,KAAK,YAAY,QAAQ;AAAA,IACjC,UAAU,KAAK,YAAY,UAAU;AAAA,IACrC,QAAQ,KAAK,YAAY,QAAQ;AAAA,EACnC;AACF;AAKO,IAAM,gBAAgB,KAAK,iBAAiB,WAAW;AACvD,IAAM,sBAAsB,KAAK,eAAe,aAAa,UAAU;AAO9E,IAAM,cAAc,cAAc,YAAY,GAAG;AACjD,IAAM,aAAa,QAAQ,WAAW;AAKtC,IAAI;AACJ,IAAI,WAAW,SAAS,OAAO,GAAG;AAEhC,gBAAc,QAAQ,QAAQ,UAAU,CAAC;AAC3C,OAAO;AAEL,gBAAc,WAAW,SAAS,MAAM,IACpC,QAAQ,QAAQ,UAAU,CAAC,IAC3B,QAAQ,UAAU;AACxB;AAEO,IAAM,uBAAuB,KAAK,aAAa,WAAW;AAC1D,IAAM,2BAA2B,KAAK,sBAAsB,SAAS;AACrE,IAAM,qBAAqB,KAAK,aAAa,SAAS;AAGtD,IAAM,YAAY;AAAA,EACvB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;","names":[]}