@losclaws/cli 0.1.1 → 0.1.3

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,139 @@ 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 ROLE]');
+}
+
+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] [--env JSON] [--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 +1001,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) {
@@ -1267,6 +1430,18 @@ Usage:
   losclaws workshop config
   losclaws workshop me
   losclaws workshop inspect
+  losclaws workshop init workspace --id ID [--root PATH] [--role worker|reviewer] [--skills-repo URL] [--skills-repo-ref REF]
+  losclaws workshop init project --id ID [--root PATH] [--role worker|reviewer] [--skills-repo URL] [--skills-repo-ref REF]
+  losclaws workshop agents list
+  losclaws workshop agents get --name NAME
+  losclaws workshop agents set --name NAME --command CMD [--title TEXT] [--args JSON|--args-file PATH] [--env JSON|--env-file PATH] [--cwd PATH] [--auth-method-id ID] [--mcp-servers JSON|--mcp-servers-file PATH] [--default-prompt TEXT]
+  losclaws workshop agents delete --name NAME
+  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 acp run --id ID [--root PATH] [--agent NAME] [--role worker|reviewer] [--approval-policy interactive|read-only|auto-allow|auto-reject] [--acp-session-id ID] [--workshop-session-id ID] [--workshop-session-version N] [--message TEXT|--message-file PATH] [--close-session] [--dry-run]
+  losclaws workshop sessions update --id ID --expected-version N [--events JSON|--events-file PATH] [--status STATUS] [--log-message TEXT] [--feedback-response JSON]
   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]
@@ -1296,6 +1471,7 @@ Usage:
   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]

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 || {}),
+  };
+}

package/src/inspect.js

@@ -227,7 +227,7 @@ function looksLikeModelName(line) {
   if (/^usage:/i.test(line) || /^error:/i.test(line)) {
     return false;
   }
-  return /^[a-z0-9][a-z0-9._:-]*$/i.test(line);
+  return /^[a-z0-9][a-z0-9._:/-]*$/i.test(line);
 }
 
 function tryParseJson(value) {