ticlawk 0.1.15-dev.4 → 0.1.15-dev.6

package/README.md

@@ -321,11 +321,6 @@ Usage:
   ticlawk config set <adapter|streaming...|runtimes.claude_code.path|runtimes.codex.path|runtimes.opencode.path|runtimes.pi.path|telegram.bot-token|ticlawk.connector-api-key|ticlawk.api-url|ticlawk.connector-ws-url> <value>
   ticlawk auth <adapter> [adapter-auth-args...]
   ticlawk connect
-  ticlawk connect [--adapter <adapter>] [--session-id <id>] [--workdir <dir>] [--switch-user]
-  ticlawk connect [--adapter <adapter>] --type codex [--session-id <id>] [--workdir <dir>] [--name <name>] [--runtime-path <path>] [--switch-user]
-  ticlawk connect [--adapter <adapter>] --type openclaw --agent-id <id> [--name <name>] [--runtime-path <path>] [--switch-user]
-  ticlawk connect [--adapter <adapter>] --type opencode [--session-id <id>] [--workdir <dir>] [--name <name>] [--runtime-path <path>] [--switch-user]
-  ticlawk connect [--adapter <adapter>] --type pi [--session-id <id>] [--workdir <dir>] [--name <name>] [--runtime-path <path>] [--switch-user]
   ticlawk profile list
   ticlawk profile current
   ticlawk profile use ticlawk:<user-id>
@@ -359,15 +354,7 @@ Config examples:
 
 Examples:
   ticlawk connect
-  ticlawk connect --type codex --workdir /path/to/project
-  ticlawk connect --type openclaw --agent-id main
   ticlawk auth telegram --bot-token <bot-token>
-  ticlawk connect --adapter telegram --workdir /path/to/project
-  ticlawk connect --adapter telegram --session-id <claude-session-id>
-  ticlawk connect --adapter telegram --type codex --workdir /path/to/project
-  ticlawk connect --adapter telegram --type openclaw --agent-id main
-  ticlawk connect --adapter telegram --type opencode --workdir /path/to/project
-  ticlawk connect --adapter telegram --type pi --workdir /path/to/project
 ```
 <!-- usage:end -->
 

package/bin/ticlawk.mjs

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import { request } from 'node:http';
-import { resolve } from 'node:path';
 import { installProcessDiagnostics } from '../src/core/diagnostics.mjs';
 import {
   AF_ADAPTER_KEY,
@@ -9,11 +8,9 @@ import {
   loadPersistentConfig,
   getStreamingConfigView,
   normalizeAdapterConfigTarget,
-  normalizeAdapterName,
   normalizeRuntimeConfigTarget,
   normalizeStreamingTarget,
   persistConfig,
-  SUPPORTED_ADAPTERS,
   TICLAWK_CONNECTOR_API_KEY,
   TICLAWK_CONNECTOR_WS_URL,
 } from '../src/core/config.mjs';
@@ -27,10 +24,7 @@ import { getAdapterAuthHelp, runAdapterAuth } from '../src/core/adapter-registry
 import { runTiclawkConnect } from '../src/core/ticlawk-control.mjs';
 import {
   RUNTIME_DEFINITIONS,
-  getRuntimeDefinition,
-  getRuntimeDisplayName,
   getRuntimeExecutableDefinitions,
-  normalizeServiceType,
 } from '../src/core/runtime-registry.mjs';
 import { runSelfUpdate, readPkgVersion } from '../src/core/update.mjs';
 import { getUninstallHelp, runSelfUninstall } from '../src/core/uninstall.mjs';
@@ -44,40 +38,12 @@ function getConfigKeyUsage() {
   return ['adapter', 'streaming...', ...runtimeKeys, 'telegram.bot-token', 'ticlawk.connector-api-key', 'ticlawk.api-url', 'ticlawk.connector-ws-url'].join('|');
 }
 
-function getRuntimeConnectUsageLines() {
-  return RUNTIME_DEFINITIONS
-    .filter((runtime) => !runtime.aliases.includes(''))
-    .map((runtime) => {
-      if (runtime.connect?.locator === 'agentId') {
-        return `  ticlawk connect [--adapter <adapter>] --type ${runtime.name} --agent-id <id> [--name <name>] [--runtime-path <path>] [--switch-user]`;
-      }
-      return `  ticlawk connect [--adapter <adapter>] --type ${runtime.name} [--session-id <id>] [--workdir <dir>] [--name <name>] [--runtime-path <path>] [--switch-user]`;
-    })
-    .join('\n');
-}
-
 function getRuntimeConfigExamples() {
   return getRuntimeExecutableDefinitions()
     .map((runtime) => `  ticlawk config set ${runtime.executableCliKey} /path/to/${runtime.name} # advanced/manual`)
     .join('\n');
 }
 
-function getRuntimeConnectExamples() {
-  return [
-    '  ticlawk connect --adapter telegram --workdir /path/to/project',
-    '  ticlawk connect --adapter telegram --session-id <claude-session-id>',
-    ...RUNTIME_DEFINITIONS
-      .filter((runtime) => !runtime.aliases.includes(''))
-      .slice(0, 4)
-      .map((runtime) => {
-        if (runtime.connect?.locator === 'agentId') {
-          return `  ticlawk connect --adapter telegram --type ${runtime.name} --agent-id main`;
-        }
-        return `  ticlawk connect --adapter telegram --type ${runtime.name} --workdir /path/to/project`;
-      }),
-  ].join('\n');
-}
-
 function getUsageText() {
   const configKeys = getConfigKeyUsage();
   return `ticlawk
@@ -92,8 +58,6 @@ Usage:
   ticlawk config set <${configKeys}> <value>
   ticlawk auth <adapter> [adapter-auth-args...]
   ticlawk connect
-  ticlawk connect [--adapter <adapter>] [--session-id <id>] [--workdir <dir>] [--switch-user]
-${getRuntimeConnectUsageLines()}
   ticlawk profile list
   ticlawk profile current
   ticlawk profile use ticlawk:<user-id>
@@ -124,10 +88,7 @@ ${getRuntimeConfigExamples()}
 
 Examples:
   ticlawk connect
-  ticlawk connect --type codex --workdir /path/to/project
-  ticlawk connect --type openclaw --agent-id main
   ticlawk auth telegram --bot-token <bot-token>
-${getRuntimeConnectExamples()}
 `;
 }
 
@@ -153,14 +114,10 @@ Use \`connect\` to connect the selected adapter to a local runtime.
 For ticlawk, connect starts the QR pairing flow when no local credential exists.
 Run \`ticlawk connect\` from a project directory to auto-detect
 Codex, Claude Code, opencode, and pi, then choose the runtime in ticlawk.
-By default connect records the runtime binary found in your current terminal.
-Use \`--runtime-path <path>\` only when you need to override that discovery.
+No pairing QR code is shown when no local agent harness is detected.
 
 Examples:
   ticlawk connect
-  ticlawk connect --type codex --workdir /path/to/project
-  ticlawk connect --type openclaw --agent-id main
-${getRuntimeConnectExamples()}
 `;
 }
 
@@ -260,84 +217,35 @@ function formatSecretConfigValue(configKey, value) {
   return value || '';
 }
 
-function requireAdapter(value) {
-  const adapterId = normalizeAdapterName(value);
-  if (!adapterId) {
-    const supported = SUPPORTED_ADAPTERS.join(', ');
-    console.error(`invalid adapter: ${value || ''} (supported: ${supported})`);
-    process.exit(1);
-  }
-  return adapterId;
-}
-
-function getConnectAdapter(value) {
-  if (value === undefined || value === null || value === '') {
-    return getConfiguredAdapter();
-  }
-  return requireAdapter(value);
-}
-
 function buildConnectPayload(args) {
+  const legacyArgs = [
+    'adapter',
+    'type',
+    'session-id',
+    'workdir',
+    'cwd',
+    'project-dir',
+    'agent-id',
+    'runtime-path',
+    'code',
+  ].filter((key) => args[key] !== undefined);
   const positionalRuntime = args._?.[1];
-  const serviceType = normalizeServiceType(args.type || positionalRuntime);
-  const explicitWorkdir = args.workdir || args.cwd || args['project-dir'];
-  const workdir = explicitWorkdir ? resolve(explicitWorkdir) : process.cwd();
-  const hasExplicitAdapter = Boolean(args.adapter);
-  const adapter = (!serviceType && !hasExplicitAdapter)
-    ? 'ticlawk'
-    : getConnectAdapter(args.adapter);
-  if (!serviceType) {
-    if (adapter === 'ticlawk' && !args.type && !positionalRuntime) {
-      return {
-        adapter,
-        autoRuntime: true,
-        switchUser: Boolean(args['switch-user']),
-        workdir,
-        ...(args.name ? { name: args.name } : {}),
-      };
-    }
-    console.error(`invalid runtime type: ${args.type || positionalRuntime || ''}`);
+  if (positionalRuntime || legacyArgs.length > 0) {
+    const suffix = positionalRuntime ? ` ${positionalRuntime}` : '';
+    console.error(`ticlawk connect${suffix} no longer accepts explicit runtime, adapter, session, or workdir arguments.`);
+    console.error('Run `ticlawk connect` from the directory you want to offer to local agent harnesses.');
+    console.error('Ticlawk will detect Codex, Claude Code, opencode, and pi locally, then let you choose in the app.');
     process.exit(1);
   }
-
-  const runtimeDefinition = getRuntimeDefinition(serviceType);
-  if (runtimeDefinition?.connect?.locator === 'agentId') {
-    return {
-      adapter,
-      serviceType,
-      agentId: args['agent-id'],
-      ...(explicitWorkdir ? { workdir } : {}),
-      ...(args['runtime-path'] ? { runtimePath: resolve(args['runtime-path']) } : {}),
-      name: args.name || args['agent-id'],
-      switchUser: Boolean(args['switch-user']),
-    };
-  }
-
   return {
-    adapter,
-    serviceType,
-    sessionId: args['session-id'],
+    adapter: 'ticlawk',
+    autoRuntime: true,
     switchUser: Boolean(args['switch-user']),
-    workdir,
+    workdir: process.cwd(),
     ...(args.name ? { name: args.name } : {}),
-    ...(args['runtime-path'] ? { runtimePath: resolve(args['runtime-path']) } : {}),
   };
 }
 
-function validateConnectPayload(payload) {
-  if (payload.autoRuntime) return;
-  const runtimeDefinition = getRuntimeDefinition(payload.serviceType);
-  if (runtimeDefinition?.connect?.locator === 'agentId' && !payload.agentId) {
-    console.error(`--agent-id is required for ${getRuntimeDisplayName(payload.serviceType)} connect`);
-    process.exit(1);
-  }
-  if (runtimeDefinition?.connect?.locator !== 'agentId' && !payload.sessionId && !payload.workdir) {
-    const runtimeName = getRuntimeDisplayName(payload.serviceType);
-    console.error(`either --session-id or --workdir is required for ${runtimeName} connect`);
-    process.exit(1);
-  }
-}
-
 function printCommandResult(result) {
   if (result?.body?.help) {
     console.log(result.body.help);
@@ -570,7 +478,6 @@ async function main() {
       return;
     }
     const payload = buildConnectPayload(args);
-    validateConnectPayload(payload);
     const res = await runTiclawkConnect(payload);
     printCommandResult(res);
     if (res.statusCode < 400) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticlawk",
-  "version": "0.1.15-dev.4",
+  "version": "0.1.15-dev.6",
   "description": "Connect local agent harnesses to Ticlawk, Telegram, and other mobile clients.",
   "type": "module",
   "main": "ticlawk.mjs",

package/src/adapters/ticlawk/index.mjs

@@ -192,6 +192,19 @@ function runtimeLabel(runtime) {
   return runtime || 'Agent';
 }
 
+function printDetectedRuntimeOptions(runtimeOptions = []) {
+  console.log('Detected agent harness:');
+  if (!runtimeOptions.length) {
+    console.log('  none');
+    return;
+  }
+  for (const option of runtimeOptions) {
+    const label = option.runtime_label || runtimeLabel(option.runtime);
+    const workdir = option.workdir ? ` (${option.workdir})` : '';
+    console.log(`  - ${label}${workdir}`);
+  }
+}
+
 async function buildAutoRuntimeOptions(ctx, payload = {}) {
   const workdir = getRuntimeWorkdir(payload) || process.cwd();
   const candidates = ['codex', 'claude_code', 'opencode', 'pi'];
@@ -875,8 +888,11 @@ export function createTiclawkAdapter(ctx) {
   async function connectWithQrPairing(payload) {
     const autoRuntime = Boolean(payload?.autoRuntime);
     const runtimeOptions = autoRuntime ? await buildAutoRuntimeOptions(ctx, payload) : [];
-    if (autoRuntime && runtimeOptions.length === 0) {
-      throw new Error('No supported local agent runtime found in this terminal. Install or sign in to Codex, Claude Code, OpenCode, or pi, then try again.');
+    if (autoRuntime) {
+      printDetectedRuntimeOptions(runtimeOptions);
+      if (runtimeOptions.length === 0) {
+        return connectError(400, 'No supported local agent harness detected in this terminal. Install or sign in to Codex, Claude Code, OpenCode, or pi, then run `ticlawk connect` again.');
+      }
     }
     const resolved = autoRuntime ? null : await ctx.resolveRuntimeBinding(payload);
     const runtimeMeta = resolved?.runtimeMeta || {};
@@ -996,15 +1012,24 @@ export function createTiclawkAdapter(ctx) {
 
     async connect(payload) {
       const config = loadPersistentConfig();
-      const connectCode = String(payload?.code || config.TICLAWK_SETUP_CODE || '').trim();
-      if (!connectCode) {
+      if (!payload?.__legacyConnect) {
         try {
-          return await connectWithQrPairing.call(this, payload);
+          return await connectWithQrPairing.call(this, {
+            ...payload,
+            autoRuntime: true,
+          });
         } catch (err) {
           return connectError(err?.status || 500, err.message);
         }
       }
 
+      // Archived setup-code connect path. It is intentionally not reachable
+      // from the public CLI; keep it here only until the old flow is deleted.
+      const connectCode = String(payload?.code || config.TICLAWK_SETUP_CODE || '').trim();
+      if (!connectCode) {
+        return connectError(400, 'legacy ticlawk setup-code connect requires code');
+      }
+
       try {
         const resolved = await ctx.resolveRuntimeBinding(payload);
         const runtimeMeta = resolved.runtimeMeta;