@astrosheep/square 0.3.7 → 0.3.8

package/codex-plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "square",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Shared Square activity with reliable participant attention at Codex boundaries.",
   "author": {
     "name": "Square"

package/dist/harness-claude.js

@@ -33,6 +33,7 @@ export async function installClaudePlugin(homeDir, run = runClaude) {
         fs.cpSync(fileURLToPath(new URL('../skills/square/', import.meta.url)), plugin, { recursive: true });
         writeJson(path.join(stage, '.claude-plugin', 'marketplace.json'), {
             name: CLAUDE_MARKETPLACE_NAME,
+            owner: { name: 'Square' },
             plugins: [{ name: SQUARE_IDENTITY.pluginName, source: './plugins/square' }],
         });
     });

package/dist/harness-codex.js

@@ -12,8 +12,33 @@ const LEGACY_MARKETPLACES = ['astrosheep-square'];
 export function codexMarketplaceRoot(homeDir) {
     return path.join(homeDir, '.square', 'codex', 'marketplaces', CODEX_MARKETPLACE_NAME);
 }
-export function codexPluginRoot(homeDir) { return path.join(codexMarketplaceRoot(homeDir), 'plugins', SQUARE_IDENTITY.pluginName); }
-export function codexPluginHooksPath(homeDir) { return path.join(codexPluginRoot(homeDir), 'hooks', 'hooks.json'); }
+function configuredMarketplaceRoot(homeDir, configText) {
+    const lines = configText.split('\n');
+    const header = `[marketplaces.${CODEX_MARKETPLACE_NAME}]`;
+    const start = lines.findIndex((line) => line.trim() === header);
+    if (start < 0)
+        return undefined;
+    const end = lines.findIndex((line, index) => index > start && /^\s*\[[^\]]+\]/.test(line));
+    const section = lines.slice(start + 1, end < 0 ? undefined : end);
+    const sourceType = section.find((line) => /^\s*source_type\s*=/.test(line));
+    if (sourceType && !/=\s*["']local["']\s*$/.test(sourceType))
+        return undefined;
+    const source = section.find((line) => /^\s*source\s*=/.test(line));
+    const match = source?.match(/^\s*source\s*=\s*("(?:\\.|[^"])*"|'[^']*')\s*$/);
+    if (!match)
+        return undefined;
+    const value = match[1].startsWith('"') ? JSON.parse(match[1]) : match[1].slice(1, -1);
+    return path.isAbsolute(value) ? value : path.resolve(codexHome(homeDir), value);
+}
+function activeMarketplaceRoot(homeDir, configText) {
+    return configuredMarketplaceRoot(homeDir, configText) ?? codexMarketplaceRoot(homeDir);
+}
+export function codexPluginRoot(homeDir, marketplaceRoot = codexMarketplaceRoot(homeDir)) {
+    return path.join(marketplaceRoot, 'plugins', SQUARE_IDENTITY.pluginName);
+}
+export function codexPluginHooksPath(homeDir, marketplaceRoot = codexMarketplaceRoot(homeDir)) {
+    return path.join(codexPluginRoot(homeDir, marketplaceRoot), 'hooks', 'hooks.json');
+}
 function codexHome(homeDir) { return path.join(homeDir, '.codex'); }
 export function codexHomeHooksPath(homeDir) { return path.join(codexHome(homeDir), 'hooks.json'); }
 export function codexConfigPath(homeDir) { return path.join(codexHome(homeDir), 'config.toml'); }
@@ -53,9 +78,9 @@ function writeAtomic(file, text) {
     fs.renameSync(temp, file);
 }
 export async function installCodexPlugin(homeDir, run = runCodex) {
-    const root = codexMarketplaceRoot(homeDir);
     const config = codexConfigPath(homeDir);
     const current = fs.existsSync(config) ? fs.readFileSync(config, 'utf8') : '';
+    const root = activeMarketplaceRoot(homeDir, current);
     const staged = stageReplacement(root, (stage) => {
         const plugin = path.join(stage, 'plugins', SQUARE_IDENTITY.pluginName);
         fs.cpSync(fileURLToPath(new URL('../codex-plugin/', import.meta.url)), plugin, { recursive: true });
@@ -88,7 +113,7 @@ export async function installCodexPlugin(homeDir, run = runCodex) {
             notes.push(`retired ${pluginId}`);
         }
         staged.finalize();
-        return { configPath: config, marketplaceRoot: root, pluginRoot: codexPluginRoot(homeDir), ...(installedPath ? { installedPath } : {}), notes };
+        return { configPath: config, marketplaceRoot: root, pluginRoot: codexPluginRoot(homeDir, root), ...(installedPath ? { installedPath } : {}), notes };
     }
     catch (error) {
         staged.rollback();
@@ -96,24 +121,27 @@ export async function installCodexPlugin(homeDir, run = runCodex) {
     }
 }
 export async function uninstallCodexPlugin(homeDir, run = runCodex) {
+    const config = codexConfigPath(homeDir);
+    const current = fs.existsSync(config) ? fs.readFileSync(config, 'utf8') : '';
+    const root = activeMarketplaceRoot(homeDir, current);
     requireSuccess(run(homeDir, ['plugin', 'remove', CODEX_PLUGIN_ID, '--json']), 'plugin removal', true);
     requireSuccess(run(homeDir, ['plugin', 'marketplace', 'remove', CODEX_MARKETPLACE_NAME, '--json']), 'marketplace removal', true);
     for (const marketplace of LEGACY_MARKETPLACES) {
         requireSuccess(run(homeDir, ['plugin', 'remove', `${SQUARE_IDENTITY.pluginName}@${marketplace}`, '--json']), 'legacy plugin removal', true);
         requireSuccess(run(homeDir, ['plugin', 'marketplace', 'remove', marketplace, '--json']), 'legacy marketplace removal', true);
     }
-    const root = codexMarketplaceRoot(homeDir);
     fs.rmSync(root, { recursive: true, force: true });
     fs.rmSync(codexHomeHooksPath(homeDir), { force: true });
     return { paths: [root, codexConfigPath(homeDir), codexHomeHooksPath(homeDir)], notes: [] };
 }
 export async function doctorCodexPlugin(homeDir, run = runCodex) {
-    const root = codexMarketplaceRoot(homeDir);
     const config = codexConfigPath(homeDir);
+    const current = fs.existsSync(config) ? fs.readFileSync(config, 'utf8') : '';
+    const root = activeMarketplaceRoot(homeDir, current);
     const listed = run(homeDir, ['plugin', 'list', '--json']);
     return [
-        /^hooks\s*=\s*true$/m.test(fs.existsSync(config) ? fs.readFileSync(config, 'utf8') : '') ? `✓ features.hooks=true in ${config}` : `○ features.hooks missing in ${config}`,
-        fs.existsSync(codexPluginHooksPath(homeDir)) ? `✓ Square plugin hooks ${codexPluginHooksPath(homeDir)}` : `○ Square plugin bundle missing ${root}`,
+        /^hooks\s*=\s*true$/m.test(current) ? `✓ features.hooks=true in ${config}` : `○ features.hooks missing in ${config}`,
+        fs.existsSync(codexPluginHooksPath(homeDir, root)) ? `✓ Square plugin hooks ${codexPluginHooksPath(homeDir, root)}` : `○ Square plugin bundle missing ${root}`,
         listed.status === 0 && listed.stdout.includes(CODEX_PLUGIN_ID) ? `✓ ${CODEX_PLUGIN_ID} installed` : `○ ${CODEX_PLUGIN_ID} unavailable`,
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/square",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "A shared public square where agents join, catch activity, express, and step out when done.",
   "type": "module",
   "bin": {

package/skills/square/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "square",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Native Claude Code turn-boundary delivery for Square participants",
   "author": {
     "name": "Square"