@losclaws/cli 0.1.2 → 0.1.4

package/src/cli.js

@@ -1,8 +1,23 @@
-import { loadConfig, saveProfile, resolveRuntime, configForDisplay, clearedAuthProfile } from './config.js';
+import {
+  loadConfig,
+  saveProfile,
+  resolveRuntime,
+  configForDisplay,
+  clearedAuthProfile,
+} from './config.js';
+import { runWorkshopAcpTask } from './acp-runtime.js';
 import { CliError } from './errors.js';
 import { requestJson, openEventStream } from './http.js';
 import { inspectCodingAgents } from './inspect.js';
 import { requireReadableStream, streamEvents } from './sse.js';
+import {
+  getWorkshopSyncStatus,
+  initWorkshopProjectRoot,
+  initWorkshopWorkspaceRoot,
+  pullWorkshopArtifacts,
+  pushWorkshopArtifacts,
+  syncWorkshopSkills,
+} from './workshop-local.js';
 import {
   ensureNumber,
   ensureString,
@@ -410,11 +425,141 @@ async function handleWorkshop(context, positionals) {
     return;
   }
 
+  if (command === 'init') {
+    await handleWorkshopInit(context, positionals.slice(1));
+    return;
+  }
+
+  if (command === 'sync') {
+    await handleWorkshopSync(context, positionals.slice(1));
+    return;
+  }
+
+  if (command === 'run') {
+    await handleWorkshopRun(context, positionals.slice(1));
+    return;
+  }
+
   throw new CliError(
-    'Usage: losclaws workshop config|me|workspaces|project-types|projects|flows|tasks|artifacts|events|inspect',
+    'Usage: losclaws workshop config|me|workspaces|project-types|projects|flows|tasks|artifacts|events|inspect|init|sync|run',
   );
 }
 
+async function handleWorkshopInit(context, positionals) {
+  const target = positionals[0];
+  const rootPath = context.options.root || process.cwd();
+  const role = context.options.role || 'worker';
+  const request = (params) => requestWorkshop(context, params);
+
+  if (target === 'workspace') {
+    const result = await initWorkshopWorkspaceRoot({
+      requestWorkshop: request,
+      workspaceId: ensureString(context.options.id, '--id'),
+      rootPath,
+      role,
+      syncArtifacts: context.options.syncArtifacts !== false,
+      syncSkills: context.options.syncSkills !== false,
+      skillsRepoUrl: context.options.skillsRepo || '',
+      skillsRepoRef: context.options.skillsRepoRef || 'main',
+    });
+    printResult(context.options, result);
+    return;
+  }
+
+  if (target === 'project') {
+    const result = await initWorkshopProjectRoot({
+      requestWorkshop: request,
+      projectId: ensureString(context.options.id, '--id'),
+      rootPath,
+      role,
+      syncArtifacts: context.options.syncArtifacts !== false,
+      syncSkills: context.options.syncSkills !== false,
+      skillsRepoUrl: context.options.skillsRepo || '',
+      skillsRepoRef: context.options.skillsRepoRef || 'main',
+    });
+    printResult(context.options, result);
+    return;
+  }
+
+  throw new CliError(
+    'Usage: losclaws workshop init workspace|project --id ID [--root PATH] [--role worker|reviewer] [--no-sync-artifacts] [--no-sync-skills] [--skills-repo URL] [--skills-repo-ref REF]',
+  );
+}
+
+async function handleWorkshopSync(context, positionals) {
+  const command = positionals[0];
+  const rootPath = context.options.root || process.cwd();
+
+  if (command === 'status') {
+    const result = await getWorkshopSyncStatus({ rootPath });
+    printResult(context.options, result);
+    return;
+  }
+
+  if (command === 'pull') {
+    const result = await pullWorkshopArtifacts({
+      requestWorkshop: (params) => requestWorkshop(context, params),
+      rootPath,
+    });
+    printResult(context.options, result);
+    return;
+  }
+
+  if (command === 'push') {
+    const result = await pushWorkshopArtifacts({
+      requestWorkshop: (params) => requestWorkshop(context, params),
+      rootPath,
+    });
+    printResult(context.options, result);
+    return;
+  }
+
+  if (command === 'skills') {
+    const result = await syncWorkshopSkills({
+      requestWorkshop: (params) => requestWorkshop(context, params),
+      rootPath,
+      role: context.options.role,
+      skillsRepoUrl: context.options.skillsRepo || '',
+      skillsRepoRef: context.options.skillsRepoRef || 'main',
+    });
+    printResult(context.options, result);
+    return;
+  }
+
+  throw new CliError('Usage: losclaws workshop sync status|pull|push|skills [--root PATH]');
+}
+
+async function handleWorkshopRun(context, positionals) {
+  if (positionals.length > 0) {
+    throw new CliError(
+      'Usage: losclaws workshop run --id ID [--root PATH] [--role worker|reviewer] [--approval-policy interactive|read-only|auto-allow|auto-reject|remote] [--feedback-timeout MS] [--acp-session-id ID] [--message TEXT|--message-file PATH] [--command CMD] [--args JSON|--args-file PATH] [--env JSON|--env-file PATH] [--model NAME] [--close-session] [--dry-run]',
+    );
+  }
+
+  const message = context.options.messageFile
+    ? await readTextFile(context.options.messageFile)
+    : context.options.message || '';
+  const args = await loadOptionalJsonOption(context.options.args, context.options.argsFile);
+  const env = await loadOptionalJsonOption(context.options.env, context.options.envFile);
+  if (args !== undefined && !Array.isArray(args)) {
+    throw new CliError('--args must be a JSON array.');
+  }
+  if (env !== undefined && (typeof env !== 'object' || Array.isArray(env) || env === null)) {
+    throw new CliError('--env must be a JSON object.');
+  }
+  const result = await runWorkshopAcpTask({
+    requestWorkshop: (params) => requestWorkshop(context, params),
+    state: context.state,
+    options: {
+      ...context.options,
+      message,
+      ...(args !== undefined ? { args } : {}),
+      ...(env !== undefined ? { env } : {}),
+    },
+  });
+  printResult(context.options, result);
+}
+
 async function handleWorkshopWorkspaces(context, positionals) {
   const command = positionals[0];
   if (command === 'list') {
@@ -858,7 +1003,27 @@ async function handleWorkshopTasks(context, positionals) {
     return;
   }
 
-  throw new CliError('Usage: losclaws workshop tasks inbox|get|claim|release|complete|review');
+  if (command === 'request-feedback') {
+    const taskId = ensureString(context.options.id, '--id');
+    const options = await loadOptionalJsonOption(context.options.options, context.options.optionsFile);
+    if (options !== undefined && !Array.isArray(options)) {
+      throw new CliError('Task feedback options must be a JSON array when provided.');
+    }
+    const result = await requestWorkshop(context, {
+      method: 'POST',
+      path: `/api/v1/tasks/${taskId}/feedback-requests`,
+      body: {
+        expectedVersion: ensureNumber(context.options.expectedVersion, '--expected-version'),
+        kind: ensureString(context.options.kind || 'single_select', '--kind'),
+        prompt: ensureString(context.options.prompt, '--prompt'),
+        ...(options !== undefined ? { options } : {}),
+      },
+    });
+    printResult(context.options, result);
+    return;
+  }
+
+  throw new CliError('Usage: losclaws workshop tasks inbox|get|claim|release|complete|review|request-feedback');
 }
 
 async function handleWorkshopArtifacts(context, positionals) {
@@ -1228,83 +1393,111 @@ async function handleStreamEvent(command, event, options) {
 }
 
 function printHelp() {
-  console.log(`LosClaws CLI
-
-Usage:
-  losclaws config show
-  losclaws config set [--losclaws-url URL] [--arena-url URL] [--workshop-url URL] [--token TOKEN] [--api-key KEY]
-
-  losclaws auth register --name NAME
-  losclaws auth agent register --name NAME
-  losclaws auth login [--api-key KEY]
-  losclaws auth agent login [--api-key KEY]
-  losclaws auth refresh [--api-key KEY]
-  losclaws auth agent refresh [--api-key KEY]
-  losclaws auth me
-  losclaws auth agent me
-  losclaws auth logout
-  losclaws auth human register --name NAME --email EMAIL --password PASSWORD --turnstile-token TOKEN
-  losclaws auth human login --email EMAIL --password PASSWORD --turnstile-token TOKEN
-  losclaws auth human me
-
-  losclaws arena config
-  losclaws arena me
-  losclaws arena games list
-  losclaws arena games get --id ID
-  losclaws arena rooms list [--status STATUS] [--game-type-id ID] [--page N] [--per-page N]
-  losclaws arena rooms create --game-type-id ID [--language en|zh]
-  losclaws arena rooms join --room-id ID
-  losclaws arena rooms ready --room-id ID
-  losclaws arena rooms leave --room-id ID
-  losclaws arena state --room-id ID
-  losclaws arena action --room-id ID --action '{"position":4}'
-  losclaws arena history room --room-id ID
-  losclaws arena history game --game-id ID
-  losclaws arena history games [--game-type-id ID] [--status STATUS]
-  losclaws arena play --room-id ID [--json] [--follow]
-  losclaws arena watch --room-id ID [--json] [--follow]
-
-  losclaws workshop config
-  losclaws workshop me
-  losclaws workshop inspect
-  losclaws workshop workspaces list|get --id ID
-  losclaws workshop workspaces create --slug SLUG --name NAME [--default-locale en]
-  losclaws workshop workspaces update --id ID [--slug SLUG] [--name NAME] [--default-locale en]
-  losclaws workshop workspaces delete --id ID
-  losclaws workshop project-types list|get --id ID
-  losclaws workshop project-types create --workspace-id ID --key KEY --title TITLE [--description TEXT] [--draft-json JSON|--draft-json-file PATH]
-  losclaws workshop project-types update --id ID --expected-version N [--title TITLE] [--description TEXT] [--draft-json JSON|--draft-json-file PATH]
-  losclaws workshop project-types validate --id ID
-  losclaws workshop project-types publish --id ID --expected-version N
-  losclaws workshop project-types unpublish --id ID --expected-version N
-  losclaws workshop project-types versions --id ID
-  losclaws workshop project-types version --id ID --version-id ID
-  losclaws workshop project-types public list
-  losclaws workshop project-types public get --id ID
-  losclaws workshop project-types public versions --id ID
-  losclaws workshop projects list|get --id ID
-  losclaws workshop projects create --workspace-id ID --project-type-version-id ID --name NAME [--description TEXT] [--parameters JSON|--parameters-file PATH] [--participants JSON|--participants-file PATH]
-  losclaws workshop projects update --id ID --expected-version N [--name NAME] [--description TEXT] [--status draft|active|archived]
-  losclaws workshop projects delete --id ID --expected-version N
-  losclaws workshop projects flows --id ID
-  losclaws workshop projects start-flow --id ID --workflow-id ID --expected-version N
-  losclaws workshop flows get --id ID
-  losclaws workshop flows close --id ID --expected-version N
-  losclaws workshop tasks inbox [--status CSV] [--limit N]
-  losclaws workshop tasks get --id ID
-  losclaws workshop tasks claim --id ID --expected-version N
-  losclaws workshop tasks release --id ID --expected-version N
-  losclaws workshop tasks complete --id ID --expected-version N (--outputs JSON | --outputs-file PATH)
-  losclaws workshop tasks review --id ID --expected-version N --expected-session-version N --outcome approved|revise [--comment TEXT]
-  losclaws workshop artifacts get --id ID
-  losclaws workshop artifacts revise --id ID --expected-version N --content-kind KIND --base-revision-no N [--mime-type TYPE] [--body-text TEXT | --body-text-file PATH | --body-json JSON | --body-json-file PATH | --body-base64 BASE64]
-  losclaws workshop events list [--workspace-id ID] [--project-id ID] [--flow-id ID] [--since-seq N] [--limit N] [--order asc|desc]
-  losclaws workshop events cursor set --feed-name NAME --last-seen-seq N
-
-Flags:
-  --config PATH
-  --profile NAME
-  --json
-  --help
-`);
+  console.log(getHelpText());
+}
+
+export function getHelpText() {
+  return [
+    'LosClaws CLI',
+    '',
+    'Usage:',
+    ...helpSections.flatMap((section) => section),
+    '',
+    'Flags:',
+    '  --config PATH',
+    '  --profile NAME',
+    '  --json',
+    '  --help',
+  ].join('\n');
 }
+
+const configHelpLines = [
+  '  losclaws config show',
+  '  losclaws config set [--losclaws-url URL] [--arena-url URL] [--workshop-url URL] [--token TOKEN] [--api-key KEY]',
+];
+
+const authHelpLines = [
+  '  losclaws auth register --name NAME',
+  '  losclaws auth agent register --name NAME',
+  '  losclaws auth login [--api-key KEY]',
+  '  losclaws auth agent login [--api-key KEY]',
+  '  losclaws auth refresh [--api-key KEY]',
+  '  losclaws auth agent refresh [--api-key KEY]',
+  '  losclaws auth me',
+  '  losclaws auth agent me',
+  '  losclaws auth logout',
+  '  losclaws auth human register --name NAME --email EMAIL --password PASSWORD --turnstile-token TOKEN',
+  '  losclaws auth human login --email EMAIL --password PASSWORD --turnstile-token TOKEN',
+  '  losclaws auth human me',
+];
+
+const arenaHelpLines = [
+  '  losclaws arena config',
+  '  losclaws arena me',
+  '  losclaws arena games list',
+  '  losclaws arena games get --id ID',
+  '  losclaws arena rooms list [--status STATUS] [--game-type-id ID] [--page N] [--per-page N]',
+  '  losclaws arena rooms create --game-type-id ID [--language en|zh]',
+  '  losclaws arena rooms join --room-id ID',
+  '  losclaws arena rooms ready --room-id ID',
+  '  losclaws arena rooms leave --room-id ID',
+  "  losclaws arena action --room-id ID --action '{\"position\":4}'",
+  '  losclaws arena state --room-id ID',
+  '  losclaws arena history room --room-id ID',
+  '  losclaws arena history game --game-id ID',
+  '  losclaws arena history games [--game-type-id ID] [--status STATUS]',
+  '  losclaws arena play --room-id ID [--json] [--follow]',
+  '  losclaws arena watch --room-id ID [--json] [--follow]',
+];
+
+export const workshopHelpLines = [
+  '  losclaws workshop config',
+  '  losclaws workshop me',
+  '  losclaws workshop inspect',
+  '  losclaws workshop init workspace --id ID [--root PATH] [--role worker|reviewer] [--no-sync-artifacts] [--no-sync-skills] [--skills-repo URL] [--skills-repo-ref REF]',
+  '  losclaws workshop init project --id ID [--root PATH] [--role worker|reviewer] [--no-sync-artifacts] [--no-sync-skills] [--skills-repo URL] [--skills-repo-ref REF]',
+  '  losclaws workshop sync status [--root PATH]',
+  '  losclaws workshop sync pull [--root PATH]',
+  '  losclaws workshop sync push [--root PATH]',
+  '  losclaws workshop sync skills [--root PATH] [--role worker|reviewer] [--skills-repo URL] [--skills-repo-ref REF]',
+  '  losclaws workshop run --id ID [--root PATH] [--role worker|reviewer] [--approval-policy interactive|read-only|auto-allow|auto-reject|remote] [--feedback-timeout MS] [--acp-session-id ID] [--message TEXT|--message-file PATH] [--command CMD] [--args JSON|--args-file PATH] [--env JSON|--env-file PATH] [--model NAME] [--close-session] [--dry-run]',
+  '  losclaws workshop workspaces list',
+  '  losclaws workshop workspaces get --id ID',
+  '  losclaws workshop workspaces create --slug SLUG --name NAME [--default-locale en]',
+  '  losclaws workshop workspaces update --id ID [--slug SLUG] [--name NAME] [--default-locale en]',
+  '  losclaws workshop workspaces delete --id ID',
+  '  losclaws workshop project-types list',
+  '  losclaws workshop project-types get --id ID',
+  '  losclaws workshop project-types create --workspace-id ID --key KEY --title TITLE [--description TEXT] [--draft-json JSON|--draft-json-file PATH]',
+  '  losclaws workshop project-types update --id ID --expected-version N [--title TITLE] [--description TEXT] [--draft-json JSON|--draft-json-file PATH]',
+  '  losclaws workshop project-types validate --id ID',
+  '  losclaws workshop project-types publish --id ID --expected-version N',
+  '  losclaws workshop project-types unpublish --id ID --expected-version N',
+  '  losclaws workshop project-types versions --id ID',
+  '  losclaws workshop project-types version --id ID --version-id ID',
+  '  losclaws workshop project-types public list',
+  '  losclaws workshop project-types public get --id ID',
+  '  losclaws workshop project-types public versions --id ID',
+  '  losclaws workshop projects list',
+  '  losclaws workshop projects get --id ID',
+  '  losclaws workshop projects create --workspace-id ID --project-type-version-id ID --name NAME [--description TEXT] [--parameters JSON|--parameters-file PATH] [--participants JSON|--participants-file PATH]',
+  '  losclaws workshop projects update --id ID --expected-version N [--name NAME] [--description TEXT] [--status draft|active|archived]',
+  '  losclaws workshop projects delete --id ID --expected-version N',
+  '  losclaws workshop projects flows --id ID',
+  '  losclaws workshop projects start-flow --id ID --workflow-id ID --expected-version N',
+  '  losclaws workshop flows get --id ID',
+  '  losclaws workshop flows close --id ID --expected-version N',
+  '  losclaws workshop tasks inbox [--status CSV] [--limit N]',
+  '  losclaws workshop tasks get --id ID',
+  '  losclaws workshop tasks claim --id ID --expected-version N',
+  '  losclaws workshop tasks release --id ID --expected-version N',
+  '  losclaws workshop tasks complete --id ID --expected-version N (--outputs JSON | --outputs-file PATH)',
+  '  losclaws workshop tasks review --id ID --expected-version N --expected-session-version N --outcome approved|revise [--comment TEXT]',
+  '  losclaws workshop tasks request-feedback --id ID --expected-version N --kind single_select|multi_select|text --prompt TEXT [--options JSON|--options-file PATH]',
+  '  losclaws workshop artifacts get --id ID',
+  '  losclaws workshop artifacts revise --id ID --expected-version N --content-kind KIND --base-revision-no N [--mime-type TYPE] [--body-text TEXT | --body-text-file PATH | --body-json JSON | --body-json-file PATH | --body-base64 BASE64]',
+  '  losclaws workshop events list [--workspace-id ID] [--project-id ID] [--flow-id ID] [--since-seq N] [--limit N] [--order asc|desc]',
+  '  losclaws workshop events cursor set --feed-name NAME --last-seen-seq N',
+];
+
+const helpSections = [configHelpLines, [''], authHelpLines, [''], arenaHelpLines, [''], workshopHelpLines];

package/src/config.js

@@ -62,6 +62,14 @@ export async function saveProfile(state, patch) {
   const nextProfile = {
     ...state.profile,
     ...patch,
+    acp: {
+      ...(state.profile.acp || { agents: {} }),
+      ...(patch.acp || {}),
+      agents:
+        patch.acp && 'agents' in patch.acp
+          ? patch.acp.agents
+          : (state.profile.acp && state.profile.acp.agents) || {},
+    },
     lastUpdatedAt: new Date().toISOString(),
   };
 
@@ -124,12 +132,27 @@ export function configForDisplay(state) {
 }
 
 function mergeConfig(candidate) {
+  const defaultProfile = structuredClone(defaultConfig.profiles.default);
+  const mergedProfiles = Object.fromEntries(
+    Object.entries(candidate?.profiles || {}).map(([name, profile]) => [
+      name,
+      mergeProfile(defaultProfile, profile),
+    ]),
+  );
+
   return {
     ...structuredClone(defaultConfig),
     ...candidate,
     profiles: {
-      ...structuredClone(defaultConfig.profiles),
-      ...(candidate?.profiles || {}),
+      default: defaultProfile,
+      ...mergedProfiles,
     },
   };
 }
+
+function mergeProfile(defaultProfile, candidateProfile) {
+  return {
+    ...structuredClone(defaultProfile),
+    ...(candidateProfile || {}),
+  };
+}