ticlawk 0.1.12-dev.0 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticlawk",
-  "version": "0.1.12-dev.0",
+  "version": "0.1.12",
   "description": "Connect local agent harnesses to Ticlawk, Telegram, and other mobile clients.",
   "type": "module",
   "main": "ticlawk.mjs",
@@ -9,8 +9,7 @@
     "./package.json": "./package.json"
   },
   "bin": {
-    "ticlawk": "bin/ticlawk.mjs",
-    "agent-freeway": "bin/agent-freeway.mjs"
+    "ticlawk": "bin/ticlawk.mjs"
   },
   "files": [
     "assets/",
@@ -19,7 +18,6 @@
     "src/",
     "cc-watcher.mjs",
     "ticlawk.mjs",
-    "agent-freeway.mjs",
     "README.md",
     "LICENSE"
   ],

package/scripts/postinstall.mjs

@@ -1,36 +1,17 @@
 #!/usr/bin/env node
 
-import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, renameSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-function shellQuote(value) {
-  return `'${String(value).replaceAll("'", "'\\''")}'`;
-}
-
-function isLegacyManagedWrapper(path) {
-  try {
-    if (!existsSync(path)) return false;
-    if (!lstatSync(path).isFile()) return false;
-    const content = readFileSync(path, 'utf8');
-    return (
-      content.includes('node_modules/agent-freeway/bin/agent-freeway.mjs')
-      || content.includes('node_modules/ticlawk/bin/ticlawk.mjs')
-    ) && (content.includes('.local/share') || content.includes('INSTALL_ROOT'));
-  } catch {
-    return false;
-  }
-}
-
 function runSetupReadiness(cliScript) {
   const result = spawnSync(process.execPath, [cliScript, 'setup-readiness', '--ensure-daemon'], {
     stdio: 'inherit',
     env: {
       ...process.env,
       TICLAWK_POSTINSTALL: '1',
-      AGENT_FREEWAY_POSTINSTALL: '1',
     },
   });
   if (result.status !== 0) {
@@ -41,20 +22,11 @@ function runSetupReadiness(cliScript) {
 if (process.env.npm_config_global === 'true') {
   const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..');
   const cliScript = join(packageRoot, 'bin', 'ticlawk.mjs');
-  const wrapperPaths = [
-    join(homedir(), '.local', 'bin', 'ticlawk'),
-    join(homedir(), '.local', 'bin', 'agent-freeway'),
-  ];
-
-  for (const wrapperPath of wrapperPaths) {
-    if (!isLegacyManagedWrapper(wrapperPath)) continue;
-    mkdirSync(dirname(wrapperPath), { recursive: true });
-    writeFileSync(wrapperPath, `#!/usr/bin/env bash
-set -euo pipefail
-exec ${shellQuote(process.execPath)} ${shellQuote(cliScript)} "$@"
-`);
-    chmodSync(wrapperPath, 0o755);
-    console.log(`ticlawk: migrated legacy ${wrapperPath} to this npm install`);
+  const legacyHome = join(homedir(), '.agent-freeway');
+  const ticlawkHome = join(homedir(), '.ticlawk');
+  if (!existsSync(ticlawkHome) && existsSync(legacyHome)) {
+    renameSync(legacyHome, ticlawkHome);
+    console.log(`ticlawk: migrated ${legacyHome} to ${ticlawkHome}`);
   }
 
   runSetupReadiness(cliScript);

package/src/adapters/ticlawk/api.mjs

@@ -34,41 +34,41 @@ export function getConnectorWsUrl() {
 // different agents to proceed concurrently.
 const agentEventQueues = new Map(); // agentId -> Promise
 
-export class AgentFreewayUpdateRequiredError extends Error {
+export class TiclawkUpdateRequiredError extends Error {
   constructor(payload = {}) {
-    const currentVersion = payload.current_agent_freeway_version || payload.currentAgentFreewayVersion || getAgentFreewayVersion();
-    const requiredVersion = payload.required_agent_freeway_version || payload.requiredAgentFreewayVersion || '';
+    const currentVersion = payload.current_ticlawk_version || payload.currentTiclawkVersion || getTiclawkVersion();
+    const requiredVersion = payload.required_ticlawk_version || payload.requiredTiclawkVersion || '';
     super(`Ticlawk requires ticlawk >= ${requiredVersion || 'unknown'}, current version is ${currentVersion || 'unknown'}. Please update ticlawk.`);
-    this.name = 'AgentFreewayUpdateRequiredError';
-    this.code = 'agent_freeway_update_required';
+    this.name = 'TiclawkUpdateRequiredError';
+    this.code = 'ticlawk_update_required';
     this.updateRequired = true;
     this.status = 409;
     this.statusCode = 409;
-    this.currentAgentFreewayVersion = currentVersion || null;
-    this.requiredAgentFreewayVersion = requiredVersion || null;
+    this.currentTiclawkVersion = currentVersion || null;
+    this.requiredTiclawkVersion = requiredVersion || null;
     this.payload = payload;
   }
 }
 
 export function isUpdateRequiredError(err) {
-  return Boolean(err?.updateRequired || err?.code === 'agent_freeway_update_required');
+  return Boolean(err?.updateRequired || err?.code === 'ticlawk_update_required');
 }
 
-export function getAgentFreewayVersion() {
+export function getTiclawkVersion() {
   return readPkgVersion() || '0.0.0';
 }
 
-function withAgentFreewayVersion(body = {}) {
+function withTiclawkVersion(body = {}) {
   return {
     ...body,
-    agent_freeway_version: getAgentFreewayVersion(),
+    ticlawk_version: getTiclawkVersion(),
   };
 }
 
 function isUpdateRequiredPayload(payload) {
   return Boolean(
-    payload?.error === 'agent_freeway_update_required'
-    || payload?.code === 'agent_freeway_update_required'
+    payload?.error === 'ticlawk_update_required'
+    || payload?.code === 'ticlawk_update_required'
   );
 }
 
@@ -95,7 +95,7 @@ async function apiFetch(path, opts = {}) {
   }
 
   if (isUpdateRequiredPayload(parsed)) {
-    throw new AgentFreewayUpdateRequiredError(parsed);
+    throw new TiclawkUpdateRequiredError(parsed);
   }
 
   if (!res.ok) {
@@ -171,7 +171,7 @@ export async function getPendingMessages() {
 export async function claimPendingMessages(hostId, limit = 5, excludedAgentIds = []) {
   const { data } = await apiFetch('/api/messages/claim-pending', {
     method: 'POST',
-    body: JSON.stringify(withAgentFreewayVersion({
+    body: JSON.stringify(withTiclawkVersion({
       runtime_host_id: hostId,
       limit,
       excluded_agent_ids: excludedAgentIds,
@@ -190,7 +190,7 @@ export async function syncMessages(rows) {
 export async function claimMessage(id, hostId) {
   return apiFetch(`/api/messages/${id}/claim`, {
     method: 'POST',
-    body: JSON.stringify(withAgentFreewayVersion({ runtime_host_id: hostId })),
+    body: JSON.stringify(withTiclawkVersion({ runtime_host_id: hostId })),
   });
 }
 
@@ -211,7 +211,7 @@ export async function completeMessage(id, hostId) {
 export async function recoverClaimedMessages(hostId) {
   return apiFetch('/api/messages/recover', {
     method: 'POST',
-    body: JSON.stringify(withAgentFreewayVersion({ runtime_host_id: hostId })),
+    body: JSON.stringify(withTiclawkVersion({ runtime_host_id: hostId })),
   });
 }
 

package/src/adapters/ticlawk/index.mjs

@@ -300,15 +300,15 @@ export function createTiclawkAdapter(ctx) {
     if (!state?.updateRequired) {
       return {
         updateRequired: false,
-        agentFreewayVersion: api.getAgentFreewayVersion(),
+        ticlawkVersion: api.getTiclawkVersion(),
         managedInstall: isManagedInstall(),
       };
     }
     return {
       updateRequired: true,
-      agentFreewayVersion: api.getAgentFreewayVersion(),
-      currentAgentFreewayVersion: state.currentAgentFreewayVersion || api.getAgentFreewayVersion(),
-      requiredAgentFreewayVersion: state.requiredAgentFreewayVersion || null,
+      ticlawkVersion: api.getTiclawkVersion(),
+      currentTiclawkVersion: state.currentTiclawkVersion || api.getTiclawkVersion(),
+      requiredTiclawkVersion: state.requiredTiclawkVersion || null,
       autoUpdateStatus: state.autoUpdateStatus || null,
       autoUpdateError: state.autoUpdateError || null,
       managedInstall: isManagedInstall(),
@@ -325,8 +325,8 @@ export function createTiclawkAdapter(ctx) {
 
   function recordUpdateRequired(err, reason) {
     const now = Date.now();
-    const currentVersion = err?.currentAgentFreewayVersion || api.getAgentFreewayVersion();
-    const requiredVersion = err?.requiredAgentFreewayVersion || null;
+    const currentVersion = err?.currentTiclawkVersion || api.getTiclawkVersion();
+    const requiredVersion = err?.requiredTiclawkVersion || null;
     const previousState = readUpdateState();
     let autoUpdateStatus = previousState?.autoUpdateStatus || 'not_started';
     let autoUpdateError = null;
@@ -334,7 +334,7 @@ export function createTiclawkAdapter(ctx) {
 
     if (!requiredVersion) {
       autoUpdateStatus = 'missing_required_version';
-      autoUpdateError = 'backend did not provide required_agent_freeway_version';
+      autoUpdateError = 'backend did not provide required_ticlawk_version';
     } else if (shouldAttemptAutoUpdate(previousState)) {
       lastAutoUpdateAttemptAt = new Date().toISOString();
       try {
@@ -347,8 +347,8 @@ export function createTiclawkAdapter(ctx) {
         if (result.started) {
           debugLog('ticlawk', 'update.auto-started', {
             reason,
-            currentAgentFreewayVersion: currentVersion,
-            requiredAgentFreewayVersion: requiredVersion,
+            currentTiclawkVersion: currentVersion,
+            requiredTiclawkVersion: requiredVersion,
             pid: result.pid || null,
             logPath: result.logPath || null,
           });
@@ -374,8 +374,8 @@ export function createTiclawkAdapter(ctx) {
       lastUpdateRequiredLogAt = now;
       debugError('ticlawk', 'update.required', {
         reason,
-        currentAgentFreewayVersion: currentVersion,
-        requiredAgentFreewayVersion: requiredVersion,
+        currentTiclawkVersion: currentVersion,
+        requiredTiclawkVersion: requiredVersion,
         autoUpdateStatus,
         managedInstall: isManagedInstall(),
         message: `Ticlawk requires ticlawk >= ${requiredVersion || 'unknown'}, current version is ${currentVersion || 'unknown'}. Please update ticlawk.`,
@@ -389,7 +389,7 @@ export function createTiclawkAdapter(ctx) {
     clearUpdateRequiredState('ticlawk');
     debugLog('ticlawk', 'update.cleared', {
       reason,
-      currentAgentFreewayVersion: api.getAgentFreewayVersion(),
+      currentTiclawkVersion: api.getTiclawkVersion(),
     });
   }
 
@@ -601,8 +601,8 @@ export function createTiclawkAdapter(ctx) {
       debugLog('ticlawk', 'claim.paused-update-required', {
         reason,
         hostId,
-        currentAgentFreewayVersion: updateRequired.currentAgentFreewayVersion || api.getAgentFreewayVersion(),
-        requiredAgentFreewayVersion: updateRequired.requiredAgentFreewayVersion || null,
+        currentTiclawkVersion: updateRequired.currentTiclawkVersion || api.getTiclawkVersion(),
+        requiredTiclawkVersion: updateRequired.requiredTiclawkVersion || null,
       });
       return { failed: true, claimed: 0, launched: 0, updateRequired: true };
     }
@@ -884,7 +884,7 @@ export function createTiclawkAdapter(ctx) {
     const clientSecret = makeClientSecret();
     const created = await api.createPairingSession({
       client: 'ticlawk',
-      client_version: api.getAgentFreewayVersion(),
+      client_version: api.getTiclawkVersion(),
       host_id: hostId,
       host_label: hostLabel,
       ...(autoRuntime ? { runtime_options: runtimeOptions } : { runtime: resolved.runtime }),

package/src/core/config.mjs

@@ -8,7 +8,7 @@
  */
 
 import dotenv from 'dotenv';
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { RUNTIME_DEFINITIONS, normalizeServiceType } from './runtime-registry.mjs';
@@ -18,9 +18,10 @@ const LEGACY_AGENT_FREEWAY_HOME = join(homedir(), '.agent-freeway');
 
 function resolveTiclawkHome() {
   if (process.env.TICLAWK_HOME) return process.env.TICLAWK_HOME;
-  if (process.env.AGENT_FREEWAY_HOME) return process.env.AGENT_FREEWAY_HOME;
+  if (!existsSync(DEFAULT_TICLAWK_HOME) && existsSync(LEGACY_AGENT_FREEWAY_HOME)) {
+    renameSync(LEGACY_AGENT_FREEWAY_HOME, DEFAULT_TICLAWK_HOME);
+  }
   if (existsSync(DEFAULT_TICLAWK_HOME)) return DEFAULT_TICLAWK_HOME;
-  if (existsSync(LEGACY_AGENT_FREEWAY_HOME)) return LEGACY_AGENT_FREEWAY_HOME;
   return DEFAULT_TICLAWK_HOME;
 }
 
@@ -49,9 +50,6 @@ export const SUPPORTED_ADAPTERS = ['ticlawk', 'telegram'];
 export const ADAPTER_CONFIG_KEYS = {
   'telegram.bot-token': 'TELEGRAM_BOT_TOKEN',
   'ticlawk.connector-api-key': TICLAWK_CONNECTOR_API_KEY,
-  // Backward-compatible CLI alias. This intentionally maps to the connector
-  // key instead of the generic publisher-facing TICLAWK_API_KEY name.
-  'ticlawk.api-key': TICLAWK_CONNECTOR_API_KEY,
   'ticlawk.api-url': 'TICLAWK_API_URL',
   'ticlawk.connector-ws-url': TICLAWK_CONNECTOR_WS_URL,
 };

package/src/core/daemon-install.mjs

@@ -136,8 +136,6 @@ WantedBy=default.target
 `);
 
   runRequired('systemd daemon-reload', 'systemctl', ['--user', 'daemon-reload']);
-  run('systemctl', ['--user', 'stop', 'agent-freeway']);
-  run('systemctl', ['--user', 'disable', 'agent-freeway']);
   runRequired('systemd enable', 'systemctl', ['--user', 'enable', 'ticlawk']);
 
   if (run('systemctl', ['--user', 'is-active', '--quiet', 'ticlawk']).status === 0) {
@@ -156,7 +154,6 @@ function installLaunchd() {
   }
 
   const plistDir = join(homedir(), 'Library', 'LaunchAgents');
-  const legacyLabels = ['agent-freeway', 'com.ticlawk.agent-freeway'];
   const launchdLabel = 'ticlawk';
   const plistFile = join(plistDir, `${launchdLabel}.plist`);
   const uid = String(process.getuid?.() || '');
@@ -199,9 +196,6 @@ function installLaunchd() {
     runRequired('launchd plist validation', 'plutil', ['-lint', plistFile]);
   }
 
-  for (const legacyLabel of legacyLabels) {
-    run('launchctl', ['bootout', `${launchdDomain}/${legacyLabel}`]);
-  }
   if (run('launchctl', ['print', launchdService]).status === 0) {
     runRequired('launchd kickstart', 'launchctl', ['kickstart', '-k', launchdService]);
     console.log(`launchd service restarted: ${launchdService}`);

package/src/core/uninstall.mjs

@@ -11,13 +11,12 @@ import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { AF_HOME } from './config.mjs';
 
-function getInstallRoots() {
-  const dataHome = process.env.XDG_DATA_HOME || join(homedir(), '.local', 'share');
-  return [join(dataHome, 'ticlawk'), join(dataHome, 'agent-freeway')];
+function getInstallRoot() {
+  return join(process.env.XDG_DATA_HOME || join(homedir(), '.local', 'share'), 'ticlawk');
 }
 
-function getWrapperPaths() {
-  return [join(homedir(), '.local', 'bin', 'ticlawk'), join(homedir(), '.local', 'bin', 'agent-freeway')];
+function getWrapperPath() {
+  return join(homedir(), '.local', 'bin', 'ticlawk');
 }
 
 function commandExists(command) {
@@ -67,22 +66,17 @@ function removePath(path, label, { recursive = false } = {}) {
 
 function uninstallSystemd() {
   if (process.platform !== 'linux' || !commandExists('systemctl')) return;
-  for (const service of ['ticlawk', 'agent-freeway']) {
-    runBestEffort(`systemd stop ${service}`, 'systemctl', ['--user', 'stop', service]);
-    runBestEffort(`systemd disable ${service}`, 'systemctl', ['--user', 'disable', service]);
-    removePath(join(homedir(), '.config', 'systemd', 'user', `${service}.service`), 'systemd service');
-  }
+  runBestEffort('systemd stop', 'systemctl', ['--user', 'stop', 'ticlawk']);
+  runBestEffort('systemd disable', 'systemctl', ['--user', 'disable', 'ticlawk']);
+  removePath(join(homedir(), '.config', 'systemd', 'user', 'ticlawk.service'), 'systemd service');
   runBestEffort('systemd daemon-reload', 'systemctl', ['--user', 'daemon-reload'], { warn: true });
 }
 
 function uninstallLaunchd() {
   if (process.platform !== 'darwin' || !commandExists('launchctl')) return;
   const uid = String(process.getuid?.() || '');
-  for (const label of ['ticlawk', 'agent-freeway', 'com.ticlawk.agent-freeway']) {
-    runBestEffort(`launchd unload ${label}`, 'launchctl', ['bootout', `gui/${uid}/${label}`]);
-  }
+  runBestEffort('launchd unload ticlawk', 'launchctl', ['bootout', `gui/${uid}/ticlawk`]);
   removePath(join(homedir(), 'Library', 'LaunchAgents', 'ticlawk.plist'), 'launchd plist');
-  removePath(join(homedir(), 'Library', 'LaunchAgents', 'agent-freeway.plist'), 'launchd plist');
 }
 
 export function getUninstallHelp() {
@@ -92,11 +86,11 @@ Remove the ticlawk service and legacy install files while preserving local data.
 
 Removes:
   - user service: systemd on Linux, launchd on macOS
-  - CLI wrappers: ~/.local/bin/ticlawk and legacy ~/.local/bin/agent-freeway
-  - legacy managed installs: ~/.local/share/ticlawk and ~/.local/share/agent-freeway
+  - CLI wrapper: ~/.local/bin/ticlawk
+  - legacy managed install: ~/.local/share/ticlawk
 
 Preserves:
-  - ~/.ticlawk and legacy ~/.agent-freeway
+  - ~/.ticlawk
 
 To remove the npm package itself:
   npm uninstall -g ticlawk
@@ -108,13 +102,13 @@ Usage:
 }
 
 export async function runSelfUninstall(skipPrompt) {
-  const installRoots = getInstallRoots();
-  const wrapperPaths = getWrapperPaths();
+  const installRoot = getInstallRoot();
+  const wrapperPath = getWrapperPath();
 
   console.log('ticlawk uninstall');
   console.log('will remove the user service');
-  console.log(`will remove legacy install files under: ${installRoots.join(', ')}`);
-  console.log(`will remove CLI wrappers: ${wrapperPaths.join(', ')}`);
+  console.log(`will remove legacy install files under: ${installRoot}`);
+  console.log(`will remove CLI wrapper: ${wrapperPath}`);
   console.log(`will preserve data directory: ${AF_HOME}`);
 
   if (!skipPrompt) {
@@ -131,12 +125,8 @@ export async function runSelfUninstall(skipPrompt) {
 
   uninstallSystemd();
   uninstallLaunchd();
-  for (const wrapperPath of wrapperPaths) {
-    removePath(wrapperPath, 'CLI wrapper');
-  }
-  for (const installRoot of installRoots) {
-    removePath(installRoot, 'package install', { recursive: true });
-  }
+  removePath(wrapperPath, 'CLI wrapper');
+  removePath(installRoot, 'package install', { recursive: true });
   console.log(`preserved data directory: ${AF_HOME}`);
   console.log('uninstall complete');
 }

package/src/core/update-state.mjs

@@ -39,8 +39,8 @@ export function setUpdateRequiredState({ adapter, currentVersion, requiredVersio
   const updates = {
     adapter,
     updateRequired: true,
-    currentAgentFreewayVersion: currentVersion || null,
-    requiredAgentFreewayVersion: requiredVersion || null,
+    currentTiclawkVersion: currentVersion || null,
+    requiredTiclawkVersion: requiredVersion || null,
   };
   if (autoUpdateStatus) updates.autoUpdateStatus = autoUpdateStatus;
   if (autoUpdateError) updates.autoUpdateError = autoUpdateError;

package/src/core/update.mjs

@@ -30,19 +30,15 @@ function commandExists(command) {
 
 export function isManagedInstall() {
   if (process.platform === 'linux' && commandExists('systemctl')) {
-    return ['ticlawk', 'agent-freeway'].some((service) => {
-      const enabled = spawnSync('systemctl', ['--user', 'is-enabled', '--quiet', service], { stdio: 'ignore' });
-      const active = spawnSync('systemctl', ['--user', 'is-active', '--quiet', service], { stdio: 'ignore' });
-      return enabled.status === 0 || active.status === 0;
-    });
+    const enabled = spawnSync('systemctl', ['--user', 'is-enabled', '--quiet', 'ticlawk'], { stdio: 'ignore' });
+    const active = spawnSync('systemctl', ['--user', 'is-active', '--quiet', 'ticlawk'], { stdio: 'ignore' });
+    return enabled.status === 0 || active.status === 0;
   }
 
   if (process.platform === 'darwin' && commandExists('launchctl')) {
     const uid = String(process.getuid?.() || '');
-    return ['ticlawk', 'agent-freeway', 'com.ticlawk.agent-freeway'].some((label) => {
-      const service = `gui/${uid}/${label}`;
-      return spawnSync('launchctl', ['print', service], { stdio: 'ignore' }).status === 0;
-    });
+    const service = `gui/${uid}/ticlawk`;
+    return spawnSync('launchctl', ['print', service], { stdio: 'ignore' }).status === 0;
   }
 
   return false;
@@ -79,10 +75,6 @@ export function startDetachedSelfUpdate({ requiredVersion = '', currentVersion =
       TICLAWK_REQUIRED_VERSION: requiredVersion,
       TICLAWK_CURRENT_VERSION: currentVersion,
       ...(installerVersion ? { TICLAWK_VERSION: installerVersion } : {}),
-      AGENT_FREEWAY_UPDATE_REASON: reason,
-      AGENT_FREEWAY_REQUIRED_VERSION: requiredVersion,
-      AGENT_FREEWAY_CURRENT_VERSION: currentVersion,
-      ...(installerVersion ? { AGENT_FREEWAY_VERSION: installerVersion } : {}),
     },
   });
   child.unref();
@@ -135,8 +127,6 @@ export async function runSelfUpdate(skipPrompt) {
   const currentVersion = readPkgVersion();
   const targetVersion = process.env.TICLAWK_VERSION
     || process.env.TICLAWK_REQUIRED_VERSION
-    || process.env.AGENT_FREEWAY_VERSION
-    || process.env.AGENT_FREEWAY_REQUIRED_VERSION
     || 'latest';
   const packageSpec = `${PACKAGE_NAME}@${targetVersion}`;
   console.log(`current version: ${currentVersion || '(unknown)'}`);

package/agent-freeway.mjs

@@ -1,2 +0,0 @@
-// Legacy module alias kept so direct local imports can survive the rename.
-export * from './ticlawk.mjs';

package/bin/agent-freeway.mjs

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-// Legacy CLI alias kept so existing automation can survive the package rename.
-import './ticlawk.mjs';