@oneworks/cli 0.1.0-alpha.0 → 0.1.0-beta.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@oneworks/cli",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-beta.0",
+  "description": "One Works CLI",
   "repository": {
     "type": "git",
     "url": "https://github.com/oneworks-ai/app.git",
     "directory": "apps/cli"
   },
-  "description": "One Works CLI",
   "imports": {
     "#~/*.js": {
       "__oneworks__": {
@@ -35,19 +35,19 @@
     "commander": "^12.1.0",
     "fast-glob": "^3.3.3",
     "node-notifier": "^10.0.1",
-    "@oneworks/app-runtime": "0.1.0-alpha.0",
-    "@oneworks/cli-helper": "0.1.0-alpha.0",
-    "@oneworks/config": "0.1.0-alpha.0",
-    "@oneworks/hooks": "0.1.0-alpha.0",
-    "@oneworks/core": "0.1.0-alpha.0",
-    "@oneworks/managed-plugins": "0.1.0-alpha.0",
-    "@oneworks/plugin-cli-skills": "0.1.0-alpha.0",
-    "@oneworks/runtime-protocol": "0.1.0-alpha.0",
-    "@oneworks/types": "0.1.0-alpha.0",
-    "@oneworks/register": "0.1.0-alpha.0",
-    "@oneworks/runtime-store": "0.1.0-alpha.0",
-    "@oneworks/utils": "0.1.0-alpha.0",
-    "@oneworks/workspace-assets": "0.1.0-alpha.0"
+    "@oneworks/app-runtime": "0.1.0-beta.0",
+    "@oneworks/cli-helper": "0.1.0-beta.0",
+    "@oneworks/config": "0.1.0-beta.0",
+    "@oneworks/core": "0.1.0-beta.0",
+    "@oneworks/hooks": "0.1.0-beta.0",
+    "@oneworks/managed-plugins": "0.1.0-beta.0",
+    "@oneworks/plugin-cli-skills": "0.1.0-beta.0",
+    "@oneworks/register": "0.1.0-beta.0",
+    "@oneworks/types": "0.1.0-beta.0",
+    "@oneworks/runtime-protocol": "0.1.0-beta.0",
+    "@oneworks/runtime-store": "0.1.0-beta.0",
+    "@oneworks/workspace-assets": "0.1.0-beta.0",
+    "@oneworks/utils": "0.1.0-beta.0"
   },
   "devDependencies": {
     "@types/node-notifier": "^8.0.5"

package/src/cli-argv.ts

@@ -13,7 +13,8 @@ const ROOT_SUBCOMMANDS = new Set([
   'plugin',
   'report',
   'skills',
-  'stop'
+  'stop',
+  '__run'
 ])
 
 export const normalizeCliArgs = (args: string[]) => {

package/src/commands/accounts.ts

@@ -1,8 +1,8 @@
 import process from 'node:process'
 
-import { buildConfigJsonVariables, loadConfig } from '@oneworks/config'
+import { buildConfigJsonVariables, loadConfigState, resolveRuntimeAdapterConfigState } from '@oneworks/config'
 import type { AdapterCtx, AdapterManageAccountProgressEvent } from '@oneworks/types'
-import { loadAdapter } from '@oneworks/types'
+import { loadAdapter, resolveAdapterRuntimeTarget } from '@oneworks/types'
 import {
   mergeProcessEnvWithProjectEnv,
   persistAdapterAccountArtifacts,
@@ -28,19 +28,32 @@ const createTransientCache = (): AdapterCtx['cache'] => {
 
 const loadCliAdapterContext = async (adapterKey: string, cwd: string) => {
   const env = mergeProcessEnvWithProjectEnv(undefined, { workspaceFolder: cwd })
-  const [projectConfig, userConfig] = await loadConfig({
+  const configState = await loadConfigState({
     cwd,
     env,
     jsonVariables: buildConfigJsonVariables(cwd, env)
   })
-  const adapter = await loadAdapter(adapterKey)
+  const adapterTarget = resolveAdapterRuntimeTarget(adapterKey, {
+    config: configState.mergedConfig,
+    cwd
+  })
+  const runtimeConfigState = resolveRuntimeAdapterConfigState(
+    configState,
+    adapterKey,
+    adapterTarget.runtimeAdapter
+  )
+  const adapter = await loadAdapter(adapterTarget.loadSpecifier)
   const adapterCtx = {
     ctxId: `cli-adapter-accounts-${adapterKey}`,
     cwd,
     env,
     cache: createTransientCache(),
     logger: createLogger(cwd, `cli/adapter-accounts/${adapterKey}`, 'cli', '', 'info', env),
-    configs: [projectConfig, userConfig]
+    configs: [
+      runtimeConfigState.effectiveProjectConfig ?? runtimeConfigState.projectConfig,
+      runtimeConfigState.userConfig
+    ],
+    configState: runtimeConfigState
   } satisfies AdapterCtx
 
   return {

package/src/commands/adapter/prepare-selection.ts

@@ -1,5 +1,7 @@
-import { loadAdapterCliPreparer, normalizeAdapterPackageId } from '@oneworks/types'
-import type { AdapterCliPrepareTarget, AdapterCliPreparer, Config } from '@oneworks/types'
+/* eslint-disable max-lines -- prepare selection keeps parsing and runtime adapter aliasing together. */
+import { resolveConfigState, resolveRuntimeAdapterConfigState } from '@oneworks/config'
+import { loadAdapterCliPreparer, normalizeAdapterPackageId, resolveAdapterRuntimeTarget } from '@oneworks/types'
+import type { AdapterCliPrepareContext, AdapterCliPrepareTarget, AdapterCliPreparer, Config } from '@oneworks/types'
 
 const KNOWN_PREPARE_ADAPTERS = [
   'codex',
@@ -87,6 +89,50 @@ const pushUniqueRequest = (
   requests.push(request)
 }
 
+const createRuntimePrepareContext = (
+  ctx: AdapterCliPrepareContext,
+  instanceKey: string,
+  runtimeKey: string
+): AdapterCliPrepareContext => {
+  const configState = resolveConfigState({
+    configState: ctx.configState,
+    configs: ctx.configs
+  })
+  const runtimeConfigState = resolveRuntimeAdapterConfigState(configState, instanceKey, runtimeKey)
+
+  return {
+    ...ctx,
+    configs: [
+      runtimeConfigState.effectiveProjectConfig ?? runtimeConfigState.projectConfig,
+      runtimeConfigState.userConfig
+    ],
+    configState: runtimeConfigState
+  }
+}
+
+const wrapRuntimePreparer = (
+  preparer: AdapterCliPreparer,
+  instanceKey: string,
+  runtimeKey: string
+): AdapterCliPreparer => {
+  if (preparer.adapter === instanceKey && instanceKey === runtimeKey) return preparer
+
+  return {
+    ...preparer,
+    adapter: instanceKey,
+    prepare: async (ctx, options) => {
+      const result = await preparer.prepare(
+        createRuntimePrepareContext(ctx, instanceKey, runtimeKey),
+        options
+      )
+      return {
+        ...result,
+        adapter: instanceKey
+      }
+    }
+  }
+}
+
 export const resolveAdapterPrepareRequests = (params: {
   all?: boolean
   config: Config
@@ -159,6 +205,7 @@ export const resolveAdapterPrepareRequests = (params: {
 
 export const loadAdapterPreparePreparers = async (params: {
   config: Config
+  cwd?: string
   requiredTargets: string[]
 }) => {
   const configuredAdapters = Object.keys(params.config.adapters ?? {})
@@ -171,7 +218,12 @@ export const loadAdapterPreparePreparers = async (params: {
 
   for (const adapterId of adapterIds) {
     try {
-      preparers.push(await loadAdapterCliPreparer(adapterId))
+      const adapterTarget = resolveAdapterRuntimeTarget(adapterId, {
+        config: params.config,
+        cwd: params.cwd
+      })
+      const preparer = await loadAdapterCliPreparer(adapterTarget.loadSpecifier)
+      preparers.push(wrapRuntimePreparer(preparer, adapterId, adapterTarget.runtimeAdapter))
     } catch (error) {
       if (requestedAdapters.includes(adapterId)) throw error
     }

package/src/commands/adapter/prepare.ts

@@ -71,6 +71,7 @@ export const runAdapterPrepareCommand = async (
   const ctx = await createPrepareContext(options.quiet)
   const preparers = await loadAdapterPreparePreparers({
     config: ctx.configState?.mergedConfig ?? {},
+    cwd: ctx.cwd,
     requiredTargets: targets
   })
   const requests = resolveAdapterPrepareRequests({

package/src/commands/run/command.ts

@@ -76,6 +76,13 @@ type PrintInputCapableSession = ExitControllableSession & {
   respondInteraction?: (id: string, data: string | string[]) => void | Promise<void>
 }
 
+const ADAPTER_CLI_PREPARE_OPERATION_ID = 'adapter-cli-prepare'
+const ADAPTER_CLI_PREPARE_OPERATION_TITLE = 'Adapter CLI'
+const ADAPTER_CLI_PREPARE_STARTED_MESSAGE =
+  'Preparing adapter CLI. If no compatible system installation is available, One Works will install it now.'
+const ADAPTER_CLI_PREPARE_COMPLETED_MESSAGE = 'Adapter CLI is ready.'
+const ADAPTER_CLI_PREPARE_FAILED_MESSAGE = 'Adapter CLI preparation failed.'
+
 const resolveRunPrimaryWorkspaceFolder = (
   workspaceFolder: string,
   fallbackWorkspaceFolder: string
@@ -216,6 +223,7 @@ Notes:
         }
         | undefined
       let activeRuntimeEventSink: Awaited<ReturnType<typeof createRuntimeEventSink>> | undefined
+      let adapterCliPrepareOperationActive = false
       try {
         const description = descriptionArgs.join(' ')
         opts.permissionMode = resolvePermissionModeOption(opts.permissionMode, opts.yolo)
@@ -799,7 +807,23 @@ Notes:
           printIdleTimeoutController.start()
         }
 
+        const recordAdapterCliPrepareOperation = (
+          type: 'operation_started' | 'operation_completed' | 'operation_failed',
+          message: string,
+          error?: string
+        ) => {
+          adapterCliPrepareOperationActive = type === 'operation_started'
+          return runtimeEventSink?.recordOperation({
+            type,
+            operationId: ADAPTER_CLI_PREPARE_OPERATION_ID,
+            title: ADAPTER_CLI_PREPARE_OPERATION_TITLE,
+            message,
+            ...(error != null ? { error } : {})
+          }) ?? Promise.resolve()
+        }
+
         const runStartedAt = startupProfiler.now()
+        await recordAdapterCliPrepareOperation('operation_started', ADAPTER_CLI_PREPARE_STARTED_MESSAGE)
         const { session, resolvedAdapter } = await run({
           adapter: record.resume.resolvedAdapter ?? record.resume.taskOptions.adapter,
           cwd: record.resume.taskOptions.cwd ?? record.resume.cwd,
@@ -813,6 +837,15 @@ Notes:
             printIdleTimeoutController?.recordEvent()
             void runtimeEventSink?.handleAdapterEvent(event)
             if (event.type === 'init') {
+              if (adapterCliPrepareOperationActive) {
+                adapterCliPrepareOperationActive = false
+                void runtimeEventSink?.recordOperation({
+                  type: 'operation_completed',
+                  operationId: ADAPTER_CLI_PREPARE_OPERATION_ID,
+                  title: ADAPTER_CLI_PREPARE_OPERATION_TITLE,
+                  message: ADAPTER_CLI_PREPARE_COMPLETED_MESSAGE
+                })
+              }
               updateInitRecord(event.data, boundSession?.pid)
             }
             if (event.type === 'message') {
@@ -948,6 +981,7 @@ Notes:
           })
         }
       } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
         const failureSink = activeRuntimeEventSink ??
           (runtimeConsumerContext == null
             ? undefined
@@ -959,6 +993,16 @@ Notes:
               }))
         if (failureSink != null) {
           try {
+            if (adapterCliPrepareOperationActive) {
+              adapterCliPrepareOperationActive = false
+              await failureSink.recordOperation({
+                type: 'operation_failed',
+                operationId: ADAPTER_CLI_PREPARE_OPERATION_ID,
+                title: ADAPTER_CLI_PREPARE_OPERATION_TITLE,
+                message: ADAPTER_CLI_PREPARE_FAILED_MESSAGE,
+                error: message
+              })
+            }
             await failureSink.recordFailure(error)
             await failureSink.flush()
           } catch (sinkError) {
@@ -966,7 +1010,6 @@ Notes:
             console.error(`[runtime-protocol] Failed to record runtime failure: ${message}`)
           }
         }
-        const message = error instanceof Error ? error.message : String(error)
         console.error(message)
         process.exit(1)
       }

package/src/commands/run/runtime-event-sink.ts

@@ -24,6 +24,14 @@ type RuntimeEventAppendDraft = Omit<RuntimeEventDraft, 'sessionId'> & {
   sessionId?: string
 }
 
+export interface RuntimeOperationEventInput {
+  error?: string
+  message: string
+  operationId: string
+  title: string
+  type: 'operation_started' | 'operation_completed' | 'operation_failed'
+}
+
 export interface RuntimeEventSinkOptions {
   cwd: string
   env?: NodeJS.ProcessEnv
@@ -267,6 +275,24 @@ export class RuntimeEventSink {
     })
   }
 
+  recordOperation(input: RuntimeOperationEventInput) {
+    const status = input.type === 'operation_started'
+      ? 'running'
+      : input.type === 'operation_completed'
+      ? 'completed'
+      : 'failed'
+    return this.append({
+      type: input.type,
+      status,
+      operationId: input.operationId,
+      title: input.title,
+      message: input.message,
+      summary: input.message,
+      ...(input.error != null ? { error: input.error } : {}),
+      visibility: 'system'
+    })
+  }
+
   handleAdapterEvent(event: AdapterOutputEvent) {
     if (event.type === 'init') {
       return this.append({

package/src/default-skill-plugin.ts

@@ -11,6 +11,7 @@ const CLI_DEFAULT_SKILL_NAMES = [
   'oneworks-cli-print-mode',
   'oneworks-channel',
   'oneworks-mem',
+  'oneworks-model-services',
   'create-entity',
   'update-entity',
   'create-plugin'