ticlawk 0.1.12 → 0.1.14

package/README.md

@@ -253,7 +253,7 @@ ticlawk connect
 systemd linger is off, it prints the same `Action required` message shown by
 the installer.
 
-Update with `ticlawk update`. To remove the service and legacy managed
+Update with `ticlawk update`. To remove the service and managed
 install files while keeping `~/.ticlawk` config, bindings, profiles, and
 logs:
 
@@ -263,8 +263,8 @@ ticlawk uninstall
 
 That removes:
 
-- legacy `~/.local/share/ticlawk`
-- legacy `~/.local/bin/ticlawk`
+- `~/.local/share/ticlawk`
+- `~/.local/bin/ticlawk`
 - `~/.config/systemd/user/ticlawk.service` (Linux)
 - `~/Library/LaunchAgents/ticlawk.plist` (macOS)
 
@@ -340,7 +340,7 @@ Commands:
   profile  list or switch saved local identities
   install-daemon  install or refresh the background daemon
   update   update the npm package and refresh the daemon
-  uninstall  remove service and legacy install files, preserving ~/.ticlawk
+  uninstall  remove service and managed install files, preserving ~/.ticlawk
 
 Config examples:
   ticlawk config get adapter

package/bin/ticlawk.mjs

@@ -8,7 +8,6 @@ import {
   getConfiguredAdapter,
   loadPersistentConfig,
   getStreamingConfigView,
-  LEGACY_TICLAWK_API_KEY,
   normalizeAdapterConfigTarget,
   normalizeAdapterName,
   normalizeRuntimeConfigTarget,
@@ -109,7 +108,7 @@ Commands:
   profile  list or switch saved local identities
   install-daemon  install or refresh the background daemon
   update   update the npm package and refresh the daemon
-  uninstall  remove service and legacy install files, preserving ~/.ticlawk
+  uninstall  remove service and managed install files, preserving ~/.ticlawk
 
 Config examples:
   ticlawk config get adapter
@@ -227,7 +226,7 @@ function printConfigView(config = loadPersistentConfig()) {
     console.log(`${runtime.executableCliKey}=${config[runtime.executableConfigKey] || ''}`);
   }
   console.log(`telegram.bot-token=${config.TELEGRAM_BOT_TOKEN ? 'set' : 'unset'}`);
-  console.log(`ticlawk.connector-api-key=${config[TICLAWK_CONNECTOR_API_KEY] || config[LEGACY_TICLAWK_API_KEY] ? 'set' : 'unset'}`);
+  console.log(`ticlawk.connector-api-key=${config[TICLAWK_CONNECTOR_API_KEY] ? 'set' : 'unset'}`);
   console.log(`ticlawk.api-url=${config.TICLAWK_API_URL || ''}`);
   console.log(`ticlawk.connector-ws-url=${config[TICLAWK_CONNECTOR_WS_URL] || ''}`);
 }
@@ -257,7 +256,7 @@ function getLocal(path) {
 }
 
 function formatSecretConfigValue(configKey, value) {
-  if (configKey === 'TELEGRAM_BOT_TOKEN' || configKey === TICLAWK_CONNECTOR_API_KEY || configKey === LEGACY_TICLAWK_API_KEY) {
+  if (configKey === 'TELEGRAM_BOT_TOKEN' || configKey === TICLAWK_CONNECTOR_API_KEY) {
     return value ? 'set' : 'unset';
   }
   return value || '';

package/package.json

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

package/scripts/postinstall.mjs

@@ -22,11 +22,16 @@ 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 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}`);
+  const oldDataHome = join(homedir(), '.agent-freeway');
+  const newDataHome = join(homedir(), '.ticlawk');
+  const oldConfigPath = join(oldDataHome, '.config');
+  const newConfigPath = join(newDataHome, '.config');
+  if (existsSync(oldConfigPath) && !existsSync(newConfigPath)) {
+    if (existsSync(newDataHome)) {
+      renameSync(newDataHome, `${newDataHome}.pre-migration.${Date.now()}`);
+    }
+    renameSync(oldDataHome, newDataHome);
+    console.log(`ticlawk: migrated ${oldDataHome} to ${newDataHome}`);
   }
 
   runSetupReadiness(cliScript);

package/src/adapters/ticlawk/credentials.mjs

@@ -3,11 +3,10 @@
  *
  * The ticlawk connect flow returns a `tk_...` bearer key in response to
  * a local adapter connect call. We persist it to `~/.ticlawk/.config`
- * using the connector-specific env name so publisher scripts can keep using
- * `TICLAWK_API_KEY` without being polluted by ticlawk.
+ * using the connector-specific env name.
  */
 
-import { AF_ADAPTER_KEY, AF_CONFIG_PATH, LEGACY_TICLAWK_API_KEY, persistConfig, TICLAWK_CONNECTOR_API_KEY } from '../../core/config.mjs';
+import { AF_ADAPTER_KEY, AF_CONFIG_PATH, persistConfig, TICLAWK_CONNECTOR_API_KEY } from '../../core/config.mjs';
 
 export function persistApiCredential(apiKey) {
   if (!apiKey || !apiKey.startsWith('tk_')) return;
@@ -15,11 +14,9 @@ export function persistApiCredential(apiKey) {
   persistConfig({
     [AF_ADAPTER_KEY]: 'ticlawk',
     [TICLAWK_CONNECTOR_API_KEY]: apiKey,
-    [LEGACY_TICLAWK_API_KEY]: '',
     TICLAWK_SETUP_CODE: '',
   });
   process.env[TICLAWK_CONNECTOR_API_KEY] = apiKey;
-  delete process.env[LEGACY_TICLAWK_API_KEY];
   delete process.env.TICLAWK_SETUP_CODE;
   console.log(`[connect] saved ${TICLAWK_CONNECTOR_API_KEY} to ${AF_CONFIG_PATH}`);
 }

package/src/adapters/ticlawk/index.mjs

@@ -2,7 +2,7 @@ import { parseOptionArgs } from '../../core/argv.mjs';
 import { createHash, randomBytes } from 'node:crypto';
 import { createRequire } from 'node:module';
 import { basename } from 'node:path';
-import { AF_ADAPTER_KEY, LEGACY_TICLAWK_API_KEY, loadPersistentConfig, persistConfig, TICLAWK_CONNECTOR_API_KEY, TICLAWK_CONNECTOR_WS_URL } from '../../core/config.mjs';
+import { AF_ADAPTER_KEY, loadPersistentConfig, persistConfig, TICLAWK_CONNECTOR_API_KEY, TICLAWK_CONNECTOR_WS_URL } from '../../core/config.mjs';
 import { belongsToRuntimeHost, getBindingRuntimeHostId, getHostId, getHostLabel } from '../../core/host-id.mjs';
 import { debugError, debugLog } from '../../core/logger.mjs';
 import { getActiveProfile, ensureLegacyProfile, readProfileMeta, saveAndActivateProfile } from '../../core/profiles.mjs';
@@ -974,7 +974,7 @@ export function createTiclawkAdapter(ctx) {
       const runtimesHealth = Object.fromEntries(runtimeHealthEntries);
       const codexHealth = runtimesHealth.codex || {};
       return {
-        apiKey: Boolean(process.env[TICLAWK_CONNECTOR_API_KEY] || config[TICLAWK_CONNECTOR_API_KEY] || config[LEGACY_TICLAWK_API_KEY]),
+        apiKey: Boolean(process.env[TICLAWK_CONNECTOR_API_KEY] || config[TICLAWK_CONNECTOR_API_KEY]),
         wakeUrl: api.getConnectorWsUrl(),
         wakeConnected: Boolean(connectorSocket?.isConnected()),
         wakeLastStatus: wakeState.lastStatus,
@@ -1014,7 +1014,7 @@ export function createTiclawkAdapter(ctx) {
           currentIdentity = readProfileMeta(activeProfile.adapter, activeProfile.userId) || {
             userId: activeProfile.userId,
           };
-        } else if (config[TICLAWK_CONNECTOR_API_KEY] || config[LEGACY_TICLAWK_API_KEY]) {
+        } else if (config[TICLAWK_CONNECTOR_API_KEY]) {
           try {
             const me = await api.getMe();
             if (me?.userId || me?.user_id) {

package/src/core/bindings/store.mjs

@@ -3,11 +3,11 @@ import { AF_HOME } from '../config.mjs';
 import { JsonFileStore } from '../store/json-file-store.mjs';
 import { getActiveBindingsPath } from '../profiles.mjs';
 
-const LEGACY_BINDINGS_PATH = join(AF_HOME, 'bindings.json');
+const ROOT_BINDINGS_PATH = join(AF_HOME, 'bindings.json');
 const stores = new Map();
 
 function getStore() {
-  const filePath = getActiveBindingsPath(LEGACY_BINDINGS_PATH);
+  const filePath = getActiveBindingsPath(ROOT_BINDINGS_PATH);
   let store = stores.get(filePath);
   if (!store) {
     store = new JsonFileStore(filePath, []);

package/src/core/config.mjs

@@ -8,24 +8,12 @@
  */
 
 import dotenv from 'dotenv';
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { RUNTIME_DEFINITIONS, normalizeServiceType } from './runtime-registry.mjs';
 
-const DEFAULT_TICLAWK_HOME = join(homedir(), '.ticlawk');
-const LEGACY_AGENT_FREEWAY_HOME = join(homedir(), '.agent-freeway');
-
-function resolveTiclawkHome() {
-  if (process.env.TICLAWK_HOME) return process.env.TICLAWK_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;
-  return DEFAULT_TICLAWK_HOME;
-}
-
-export const AF_HOME = resolveTiclawkHome();
+export const AF_HOME = process.env.TICLAWK_HOME || join(homedir(), '.ticlawk');
 export const AF_CONFIG_PATH = join(AF_HOME, '.config');
 export const AF_LOG_PATH = join(AF_HOME, 'ticlawk.log');
 export const AF_CRASH_LOG_PATH = join(AF_HOME, 'ticlawk-crash.log');
@@ -38,7 +26,6 @@ export const AF_STREAMING_RUNTIME_KEYS = Object.fromEntries(
 );
 export const TICLAWK_CONNECTOR_API_KEY = 'TICLAWK_CONNECTOR_API_KEY';
 export const TICLAWK_CONNECTOR_WS_URL = 'TICLAWK_CONNECTOR_WS_URL';
-export const LEGACY_TICLAWK_API_KEY = 'TICLAWK_API_KEY';
 export const RUNTIME_EXECUTABLE_CONFIG_KEYS = Object.fromEntries(
   RUNTIME_DEFINITIONS
     .filter((runtime) => runtime.executableConfigKey)
@@ -129,25 +116,6 @@ export function persistConfig(updates) {
   }
 }
 
-export function migrateLegacyTiclawkConnectorKey() {
-  const current = loadPersistentConfig();
-  const legacyKey = current[LEGACY_TICLAWK_API_KEY];
-  if (!legacyKey) return false;
-
-  const updates = {
-    [LEGACY_TICLAWK_API_KEY]: '',
-  };
-  if (!current[TICLAWK_CONNECTOR_API_KEY]) {
-    updates[TICLAWK_CONNECTOR_API_KEY] = legacyKey;
-  }
-
-  persistConfig(updates);
-  delete process.env[LEGACY_TICLAWK_API_KEY];
-  return true;
-}
-
-migrateLegacyTiclawkConnectorKey();
-
 function parseBooleanish(value) {
   if (value === undefined || value === null || value === '') return null;
   const normalized = String(value).trim().toLowerCase();

package/src/core/uninstall.mjs

@@ -1,7 +1,7 @@
 /**
- * Service and legacy install cleanup.
+ * Service and managed install cleanup.
  *
- * Removes the user service and legacy managed-install files while preserving
+ * Removes the user service and managed-install files while preserving
  * ~/.ticlawk by default. The npm package is owned by npm.
  */
 
@@ -82,12 +82,12 @@ function uninstallLaunchd() {
 export function getUninstallHelp() {
   return `ticlawk uninstall
 
-Remove the ticlawk service and legacy install files while preserving local data.
+Remove the ticlawk service and managed install files while preserving local data.
 
 Removes:
   - user service: systemd on Linux, launchd on macOS
   - CLI wrapper: ~/.local/bin/ticlawk
-  - legacy managed install: ~/.local/share/ticlawk
+  - managed install files: ~/.local/share/ticlawk
 
 Preserves:
   - ~/.ticlawk
@@ -107,7 +107,7 @@ export async function runSelfUninstall(skipPrompt) {
 
   console.log('ticlawk uninstall');
   console.log('will remove the user service');
-  console.log(`will remove legacy install files under: ${installRoot}`);
+  console.log(`will remove managed install files under: ${installRoot}`);
   console.log(`will remove CLI wrapper: ${wrapperPath}`);
   console.log(`will preserve data directory: ${AF_HOME}`);