@proletariat/cli 0.3.16 → 0.3.18

package/dist/commands/workspace/remove.js

@@ -1,9 +1,9 @@
-import { Command, Args, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
+import { PromptCommand } from '../../lib/prompt-command.js';
 import { findWorkspacesByName, findWorkspaceByPath, unregisterWorkspace, normalizePath, getActiveWorkspace, } from '../../lib/machine-config.js';
-import { shouldOutputJson, outputPromptAsJson, outputErrorAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
-export default class WorkspaceRemove extends Command {
+import { shouldOutputJson, outputErrorAsJson, createMetadata, } from '../../lib/prompt-json.js';
+export default class WorkspaceRemove extends PromptCommand {
     static description = 'Unregister a workspace from the machine config (does NOT delete files)';
     static examples = [
         '<%= config.bin %> <%= command.id %> my-workspace',
@@ -23,11 +23,9 @@ export default class WorkspaceRemove extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(WorkspaceRemove);
-        // Check if JSON output mode is active
-        const jsonMode = shouldOutputJson(flags);
         const input = args.nameOrPath;
         // Resolve workspace path
-        const workspacePath = await this.resolveWorkspacePath(input, jsonMode, flags);
+        const workspacePath = await this.resolveWorkspacePath(input, flags);
         // Check if this is the active workspace
         const activeWorkspace = getActiveWorkspace();
         const wasActive = activeWorkspace === workspacePath;
@@ -45,7 +43,7 @@ export default class WorkspaceRemove extends Command {
             this.error(`Failed to unregister workspace: ${workspacePath}`);
         }
     }
-    async resolveWorkspacePath(input, jsonMode = false, flags = {}) {
+    async resolveWorkspacePath(input, flags = {}) {
         // First, try to find by path
         const normalizedPath = normalizePath(input);
         const byPath = findWorkspaceByPath(normalizedPath);
@@ -55,7 +53,7 @@ export default class WorkspaceRemove extends Command {
         // Try to find by name
         const matches = findWorkspacesByName(input);
         if (matches.length === 0) {
-            if (jsonMode) {
+            if (shouldOutputJson(flags)) {
                 outputErrorAsJson('WORKSPACE_NOT_FOUND', `Workspace not found: ${input}`, createMetadata('workspace remove', flags));
                 this.exit(1);
             }
@@ -64,27 +62,24 @@ export default class WorkspaceRemove extends Command {
         if (matches.length === 1) {
             return matches[0].path;
         }
-        // Build choices once, use for both JSON and interactive modes
+        // Build choices with command field for agent navigation
         const workspaceChoices = matches.map((w) => ({
             name: `${w.name} - ${w.path}`,
             value: w.path,
+            command: `prlt workspace remove "${w.path}" --json`,
         }));
-        const message = `Multiple workspaces found with name "${input}". Which workspace do you want to remove?`;
-        // In JSON mode, output workspace selection prompt
-        if (jsonMode) {
-            outputPromptAsJson(buildPromptConfig('list', 'workspacePath', message, workspaceChoices), createMetadata('workspace remove', flags));
-            this.exit(0);
-        }
-        // Multiple workspaces with same name - prompt user to choose
-        this.log(chalk.yellow(`Multiple workspaces found with name "${input}":`));
-        const { selected } = await inquirer.prompt([
+        const jsonModeConfig = { flags: flags, commandName: 'workspace remove' };
+        // this.prompt() handles both modes:
+        // - JSON mode: outputs prompt config as JSON and exits
+        // - Interactive mode: shows inquirer menu
+        const { selected } = await this.prompt([
             {
                 type: 'list',
                 name: 'selected',
-                message: 'Which workspace do you want to remove?',
+                message: `Multiple workspaces found with name "${input}". Which workspace do you want to remove?`,
                 choices: workspaceChoices,
             },
-        ]);
+        ], jsonModeConfig);
         return selected;
     }
 }

package/dist/commands/workspace/use.d.ts

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class WorkspaceUse extends Command {
+import { PromptCommand } from '../../lib/prompt-command.js';
+export default class WorkspaceUse extends PromptCommand {
     static description: string;
     static examples: string[];
     static args: {

package/dist/commands/workspace/use.js

@@ -1,11 +1,10 @@
-import { Command, Args, Flags } from '@oclif/core';
+import { Args, Flags } from '@oclif/core';
 import chalk from 'chalk';
-import inquirer from 'inquirer';
 import * as fs from 'node:fs';
+import { PromptCommand } from '../../lib/prompt-command.js';
 import { isValidHQ } from '../../lib/workspace.js';
 import { findWorkspacesByName, findWorkspaceByPath, setActiveWorkspace, normalizePath, getRegisteredWorkspaces, } from '../../lib/machine-config.js';
-import { shouldOutputJson, outputPromptAsJson, createMetadata, buildPromptConfig, } from '../../lib/prompt-json.js';
-export default class WorkspaceUse extends Command {
+export default class WorkspaceUse extends PromptCommand {
     static description = 'Set the active workspace';
     static examples = [
         '<%= config.bin %> <%= command.id %> my-workspace',
@@ -25,8 +24,6 @@ export default class WorkspaceUse extends Command {
     };
     async run() {
         const { args, flags } = await this.parse(WorkspaceUse);
-        // Check if JSON output mode is active
-        const jsonMode = shouldOutputJson(flags);
         const input = args.nameOrPath;
         // First, try to find by path
         const normalizedPath = normalizePath(input);
@@ -55,27 +52,24 @@ export default class WorkspaceUse extends Command {
                 this.error(`Workspace not found: ${input}`);
             }
             if (matches.length > 1) {
-                // Build choices once, use for both JSON and interactive modes
+                // Build choices with command field for agent navigation
                 const workspaceChoices = matches.map((w) => ({
                     name: `${w.name} - ${w.path}`,
                     value: w.path,
+                    command: `prlt workspace use "${w.path}" --json`,
                 }));
-                const message = `Multiple workspaces found with name "${input}". Which workspace do you want to use?`;
-                // In JSON mode, output workspace selection prompt
-                if (jsonMode) {
-                    outputPromptAsJson(buildPromptConfig('list', 'workspacePath', message, workspaceChoices), createMetadata('workspace use', flags));
-                    return;
-                }
-                // Multiple workspaces with same name - prompt user to choose
-                this.log(chalk.yellow(`Multiple workspaces found with name "${input}":`));
-                const { selected } = await inquirer.prompt([
+                const jsonModeConfig = { flags: flags, commandName: 'workspace use' };
+                // this.prompt() handles both modes:
+                // - JSON mode: outputs prompt config as JSON and exits
+                // - Interactive mode: shows inquirer menu
+                const { selected } = await this.prompt([
                     {
                         type: 'list',
                         name: 'selected',
-                        message: 'Which workspace do you want to use?',
+                        message: `Multiple workspaces found with name "${input}". Which workspace do you want to use?`,
                         choices: workspaceChoices,
                     },
-                ]);
+                ], jsonModeConfig);
                 workspace = matches.find((w) => w.path === selected);
             }
             else {

package/dist/lib/agents/commands.d.ts

@@ -30,7 +30,7 @@ export interface WorkspaceInfo {
  * Find workspace root and return workspace information.
  *
  * Search priority:
- * 1. PRLT_HQ_PATH environment variable (ONLY when DEVCONTAINER=true - for devcontainer mounts)
+ * 1. PRLT_HQ_PATH environment variable (ONLY when DEVCONTAINER=true or PRLT_TEST_ENV=true)
  * 2. Current directory tree for HQ with workspace.db
  *
  * NOTE: PRLT_HQ_PATH is ignored on host machines to support multiple agents

package/dist/lib/agents/commands.js

@@ -13,17 +13,17 @@ import { getPMOContext } from '../pmo/index.js';
  * Find workspace root and return workspace information.
  *
  * Search priority:
- * 1. PRLT_HQ_PATH environment variable (ONLY when DEVCONTAINER=true - for devcontainer mounts)
+ * 1. PRLT_HQ_PATH environment variable (ONLY when DEVCONTAINER=true or PRLT_TEST_ENV=true)
  * 2. Current directory tree for HQ with workspace.db
  *
  * NOTE: PRLT_HQ_PATH is ignored on host machines to support multiple agents
  * working in different workspaces simultaneously.
  */
 export function getWorkspaceInfo() {
-    // Check PRLT_HQ_PATH environment variable (only in devcontainers)
+    // Check PRLT_HQ_PATH environment variable (only in devcontainers or test environments)
     const hqPath = process.env.PRLT_HQ_PATH;
-    const isDevcontainer = process.env.DEVCONTAINER === 'true';
-    if (hqPath && isDevcontainer) {
+    const allowEnvHqPath = process.env.DEVCONTAINER === 'true' || process.env.PRLT_TEST_ENV === 'true';
+    if (hqPath && allowEnvHqPath) {
         const dbPath = path.join(hqPath, '.proletariat', 'workspace.db');
         if (fs.existsSync(dbPath)) {
             try {