typeclaw 0.1.2 → 0.1.3

package/src/cli/index.ts

@@ -2,9 +2,12 @@
 
 import { defineCommand, runMain } from 'citty'
 
+import { CLI_VERSION } from '../init/cli-version'
+
 const main = defineCommand({
   meta: {
     name: 'typeclaw',
+    version: CLI_VERSION,
     description: 'TypeClaw agent runtime',
   },
   subCommands: {

package/src/cli/init.ts

@@ -275,6 +275,7 @@ export const init = defineCommand({
         cwd,
         llmAuth,
         model: selectedModel.ref,
+        cliEntry: process.argv[1],
         ...(discordBotToken !== undefined ? { discordBotToken } : {}),
         ...(slackBotToken !== undefined ? { slackBotToken, slackAppToken } : {}),
         ...(telegramBotToken !== undefined ? { telegramBotToken } : {}),
@@ -414,7 +415,7 @@ function preflightFailureGuidance(result: Extract<DockerAvailability, { ok: fals
 }
 
 function reportKakaotalkAuth(result: KakaotalkAuthResult): string {
-  if (result.ok) return 'KakaoTalk credentials saved to workspace/.agent-messenger/.'
+  if (result.ok) return 'KakaoTalk credentials saved to secrets.json.'
   return `KakaoTalk login failed: ${result.reason}`
 }
 

package/src/cli/ui.ts

@@ -2,6 +2,8 @@ import { styleText } from 'node:util'
 
 import { cancel, intro, isCancel, log, note, outro, spinner as clackSpinner } from '@clack/prompts'
 
+import { type AutoUpgradeOutcome, describeAutoUpgrade } from '@/init/auto-upgrade'
+
 export { cancel, intro, isCancel, log, note, outro }
 
 function colorize(modifier: Parameters<typeof styleText>[0], s: string): string {
@@ -62,6 +64,7 @@ export type StartLikeResult = {
   hostPort: number
   containerId: string
   hostd: { state: 'registered' } | { state: 'unavailable'; reason: string } | { state: 'disabled' }
+  autoUpgrade?: AutoUpgradeOutcome
 }
 
 export function renderStartSuccess(result: StartLikeResult): string {
@@ -69,6 +72,14 @@ export function renderStartSuccess(result: StartLikeResult): string {
   const name = c.cyan(result.plan.containerName)
   const port = c.green(String(result.hostPort))
 
+  if (result.autoUpgrade) {
+    const message = describeAutoUpgrade(result.autoUpgrade)
+    if (message.length > 0) {
+      const tint = result.autoUpgrade.kind === 'exact-pin-respected' ? c.yellow : c.cyan
+      lines.push(tint(message))
+    }
+  }
+
   if (result.alreadyRunning) {
     lines.push(`${c.green('●')} ${name} is already running on host port ${port}.`)
   } else {

package/src/config/config.ts

@@ -111,13 +111,24 @@ export type GitignoreConfig = z.infer<typeof gitignoreSchema>
 // multicast/reserved, IPv6 ULA/link-local/multicast. The capability is then
 // dropped from the bounding set via setpriv before the agent process exec's,
 // so no child (python, curl, bun-spawned anything) can mutate or recover it.
-// Default is `false` so existing agent folders are unaffected by an upgrade;
-// `typeclaw init` writes `true` for new agents (handled separately in init).
+//
+// Default is `true`: the threat model that motivated this feature — prompt
+// injection asking the agent to fetch RFC1918 hosts (e.g. a LAN router admin
+// page) or the cloud-IMDS endpoint — applies to every agent equally, so the
+// safe default is "on" and
+// the explicit opt-out is for users who need their agent to reach LAN hosts
+// (NAS, internal services, sibling dev machines). PR #145 shipped this with
+// default `false` to preserve existing-folder behavior on upgrade; this
+// follow-up (the one PR #145 promised in its description) makes the default
+// match the intent. `typeclaw init` also writes `true` explicitly so the
+// field is discoverable in fresh `typeclaw.json` files. Loopback traffic
+// (`-o lo`) is always allowed by the shim, so `bun run dev` and local APIs
+// on `localhost` / `127.0.0.1` are unaffected.
 export const networkSchema = z
   .object({
-    blockInternal: z.boolean().default(false),
+    blockInternal: z.boolean().default(true),
   })
-  .default({ blockInternal: false })
+  .default({ blockInternal: true })
 
 export type NetworkConfig = z.infer<typeof networkSchema>
 

package/src/container/start.ts

@@ -7,11 +7,20 @@ import { configSchema, expandMountPath, type Config } from '@/config/config'
 import { send as sendToDaemon } from '@/hostd/client'
 import type { HttpInfoResult } from '@/hostd/protocol'
 import { ensureDaemon } from '@/hostd/spawn'
+import {
+  autoUpgradeTypeclawDep,
+  type AutoUpgradeOutcome,
+  expectedInstalledAfterUpgrade,
+  outcomeForcesInstall,
+  readInstalledTypeclawVersionFromAgent,
+} from '@/init/auto-upgrade'
 import { resolveBaseImageVersion } from '@/init/cli-version'
 import { buildDockerfile, DOCKERFILE } from '@/init/dockerfile'
 import { ensureDepsInstalled, type EnsureDepsResult } from '@/init/ensure-deps'
 import { buildGitignore, GITIGNORE_FILE } from '@/init/gitignore'
 import { refreshPackageJson } from '@/init/packagejson'
+import { runBunUpdate, type UpdateRunner } from '@/init/run-bun-install'
+import { migrateKakaotalkCredentials } from '@/secrets'
 
 import { CONTAINER_PORT, findFreePort, isPortAllocatedError } from './port'
 import {
@@ -77,6 +86,25 @@ export type StartOptions = {
   // Reusing that daemon avoids a self-shutdown when disk source has drifted.
   reuseCurrentHostDaemon?: boolean
   ensureDeps?: (cwd: string) => Promise<EnsureDepsResult>
+  // Test seam for the typeclaw-version auto-upgrade. Production callers omit
+  // this and get the real autoUpgradeTypeclawDep (which reads the CLI's own
+  // package.json). Tests inject a stub to simulate `bun -g update typeclaw`
+  // having bumped the CLI without touching the agent folder.
+  autoUpgrade?: (cwd: string) => Promise<AutoUpgradeOutcome>
+  // Test seam for the auto-upgrade-triggered registry resolution. Defaults
+  // to `bun update typeclaw --latest`. Cannot be `runBunInstall` — see the
+  // module header in src/init/auto-upgrade.ts for why install doesn't move
+  // an already-locked in-range dep.
+  forceBunUpdate?: UpdateRunner
+  // Test seam for the post-install verification. Reads the version actually
+  // present in <agent>/node_modules/typeclaw/package.json after the upgrade
+  // install completes. Defaults to readInstalledTypeclawVersionFromAgent.
+  // Verification is mandatory: `bun update` can succeed (exit 0) but still
+  // resolve to an older version than expected if the registry has issues
+  // or the spec resolution surprises us; we MUST refuse to proceed to
+  // refreshDockerfile in that case, otherwise the Dockerfile pins a stale
+  // base image and the build either fails or runs against the wrong runtime.
+  readInstalledVersion?: (cwd: string) => string | null
   // Post-`docker run` verifier. `docker run -d` returns exit 0 the moment the
   // container is created, even if its entrypoint crashes milliseconds later.
   // The default verifier polls `docker inspect` for 1.5s and converts crashes
@@ -106,6 +134,7 @@ export type StartResult =
       // every fresh launch, including the post-stale-corpse `--rm` recovery
       // path — that one rebuilds the container from scratch.
       alreadyRunning: boolean
+      autoUpgrade: AutoUpgradeOutcome
     }
   | { ok: false; reason: string }
 
@@ -118,6 +147,9 @@ export async function start({
   cliEntry,
   reuseCurrentHostDaemon = false,
   ensureDeps = (dir) => ensureDepsInstalled({ cwd: dir }),
+  autoUpgrade = (dir) => autoUpgradeTypeclawDep({ cwd: dir }),
+  forceBunUpdate = runBunUpdate,
+  readInstalledVersion = readInstalledTypeclawVersionFromAgent,
   verifyRunning = createVerifyRunning({ exec }),
 }: StartOptions): Promise<StartResult> {
   try {
@@ -149,6 +181,42 @@ export async function start({
     if (pkgRefresh.changed) {
       await commitSystemFile(cwd, pkgRefresh.files, 'Enable bun workspaces (packages/*)')
     }
+
+    // Align the agent's typeclaw dep with the global CLI version BEFORE
+    // ensureDeps runs. The classic regression this prevents: `bun -g update
+    // typeclaw` bumps the global CLI but the agent's node_modules/typeclaw
+    // stays pinned to whatever was installed at init time. refreshDockerfile
+    // then pins FROM ghcr/typeclaw-base:<old-version> and the docker build
+    // either fails (image never published) or runs against a stale runtime.
+    //
+    // We use `bun update typeclaw --latest` (NOT `bun install`) because plain
+    // install honors the lockfile and is a no-op when the lockfile already
+    // satisfies the declared spec — which is the canonical regression case
+    // (lockfile pins 0.1.0, spec says ^0.1.0, CLI is 0.1.2; install does
+    // nothing, update force-resolves to 0.1.2).
+    //
+    // After the update we MUST verify the installed version actually matches
+    // the upgrade target. `bun update` can exit 0 but resolve to a stale
+    // version (registry hiccups, surprising spec resolution). If verification
+    // fails we abort before refreshDockerfile so we never pin a stale base
+    // image to a fresh container build.
+    const upgrade = await autoUpgrade(cwd)
+    const upgradeCommitMessage = commitMessageForAutoUpgrade(upgrade)
+    if (outcomeForcesInstall(upgrade)) {
+      const forced = await forceBunUpdate(cwd, 'typeclaw')
+      if (!forced.ok) {
+        return { ok: false, reason: `typeclaw auto-upgrade install failed: ${forced.reason}` }
+      }
+      const expected = expectedInstalledAfterUpgrade(upgrade)
+      const installedAfter = readInstalledVersion(cwd)
+      if (expected !== null && (installedAfter === null || !installedReachesTarget(installedAfter, expected))) {
+        return {
+          ok: false,
+          reason: `typeclaw auto-upgrade verification failed: bun update reported success but <agent>/node_modules/typeclaw is ${installedAfter ?? 'missing'} (expected >= ${expected}). Refusing to build a Docker image against a stale runtime.`,
+        }
+      }
+    }
+
     // Run `bun install` BEFORE the dependency-drift commit so the lockfile
     // changes the install produces are caught by the same commit. Without
     // this, upgrading the typeclaw CLI to a version that adds a new dep
@@ -160,12 +228,13 @@ export async function start({
     if (!deps.ok) {
       return { ok: false, reason: `dependency install failed: ${deps.reason}` }
     }
-    await commitSystemFile(cwd, DEPENDENCY_FILES, 'Update dependencies')
+    await commitSystemFile(cwd, DEPENDENCY_FILES, upgradeCommitMessage ?? 'Update dependencies')
     // Dockerfile refresh AFTER ensureDeps so the version pin in the FROM
     // line resolves against the agent's installed node_modules/typeclaw —
     // ensures the base image's CLI version matches the runtime the
     // container will actually load.
     await refreshDockerfile(cwd)
+    await migrateKakaotalkCredentials(cwd)
 
     if (state.exists) {
       // Container holds the name but is not running. Without `--rm`, this is
@@ -303,12 +372,31 @@ export async function start({
       hostPort,
       hostd: stripHostDaemonControl(hostd),
       alreadyRunning: false,
+      autoUpgrade: upgrade,
     }
   } catch (error) {
     return { ok: false, reason: error instanceof Error ? error.message : String(error) }
   }
 }
 
+function commitMessageForAutoUpgrade(outcome: AutoUpgradeOutcome): string | null {
+  if (outcome.kind === 'spec-rewritten') return `Upgrade typeclaw to ${outcome.to}`
+  if (outcome.kind === 'reinstall-needed') return `Upgrade typeclaw to ${outcome.to}`
+  return null
+}
+
+function installedReachesTarget(installed: string, target: string): boolean {
+  const ai = installed.match(/^(\d+)\.(\d+)\.(\d+)$/)
+  const at = target.match(/^(\d+)\.(\d+)\.(\d+)$/)
+  if (!ai || !at) return false
+  for (let i = 1; i <= 3; i++) {
+    const a = Number.parseInt(ai[i]!, 10)
+    const t = Number.parseInt(at[i]!, 10)
+    if (a !== t) return a > t
+  }
+  return true
+}
+
 export async function planStart({
   cwd,
   hostPort,
@@ -537,6 +625,7 @@ async function reportAlreadyRunning(exec: DockerExec, cwd: string, containerName
     hostPort,
     hostd: { state: 'disabled' },
     alreadyRunning: true,
+    autoUpgrade: { kind: 'skipped-already-running' },
   }
 }
 

package/src/hostd/daemon.ts

@@ -7,6 +7,8 @@ import type { Socket, UnixSocketListener } from 'bun'
 import type { PortForward } from '@/config'
 import { defaultDockerExec, type DockerExec } from '@/container'
 import type { PortForwardEvent } from '@/portbroker'
+import { kakaoChannelBlockSchema } from '@/secrets/schema'
+import { SecretsBackend } from '@/secrets/storage'
 
 import { isDaemonReachable } from './client'
 import { ensureDirs, registrationFilePath, registrationsDir, socketPath } from './paths'
@@ -16,6 +18,7 @@ import type {
   Request,
   Response as RpcResponse,
   RestartResult,
+  SecretsPatchResult,
   ShutdownResult,
   StatusResult,
   VersionResult,
@@ -351,6 +354,26 @@ export async function startDaemon(opts: DaemonOptions = {}): Promise<Daemon> {
     return { ok: true, result }
   }
 
+  const handleSecretsPatch = async (req: {
+    containerName: string
+    patch: { channels: { kakaotalk: unknown } }
+  }): Promise<RpcResponse> =>
+    runSerially(req.containerName, async () => {
+      const cwd = cwds.get(req.containerName)
+      if (!cwd) return { ok: false, reason: `not registered: ${req.containerName}` }
+      const parsed = kakaoChannelBlockSchema.safeParse(req.patch?.channels?.kakaotalk)
+      if (!parsed.success) {
+        return { ok: false, reason: parsed.error.issues.map((issue) => issue.message).join('; ') }
+      }
+      const backend = new SecretsBackend(join(cwd, 'secrets.json'))
+      await backend.updateChannelsAsync(async (channels) => ({
+        result: undefined,
+        next: { ...channels, kakaotalk: parsed.data },
+      }))
+      const result: SecretsPatchResult = { containerName: req.containerName, patched: true }
+      return { ok: true, result }
+    })
+
   const handleHttpInfo = (): RpcResponse => {
     const result: HttpInfoResult = { port: httpPort }
     return { ok: true, result }
@@ -392,6 +415,8 @@ export async function startDaemon(opts: DaemonOptions = {}): Promise<Daemon> {
         return handleStatus(req)
       case 'restart':
         return handleRestart(req)
+      case 'secrets-patch':
+        return handleSecretsPatch(req)
       case 'http-info':
         return handleHttpInfo()
       case 'version':
@@ -454,13 +479,13 @@ export async function startDaemon(opts: DaemonOptions = {}): Promise<Daemon> {
     } catch {
       return json({ ok: false, reason: 'invalid request json' }, 400)
     }
-    if (rpc.kind !== 'restart') {
-      return json({ ok: false, reason: 'http transport only supports restart' }, 403)
+    if (rpc.kind !== 'restart' && rpc.kind !== 'secrets-patch') {
+      return json({ ok: false, reason: 'http transport only supports restart and secrets-patch' }, 403)
     }
     if (restartTokens.get(rpc.containerName) !== token) {
       return json({ ok: false, reason: 'invalid restart token' }, 403)
     }
-    return json(await handleRestart(rpc))
+    return json(rpc.kind === 'restart' ? await handleRestart(rpc) : await handleSecretsPatch(rpc))
   }
 
   const httpHostname = opts.httpHost ?? '0.0.0.0'

package/src/hostd/protocol.ts

@@ -1,4 +1,5 @@
 import type { PortForward } from '@/config'
+import type { KakaoChannelBlock } from '@/secrets/schema'
 
 export type Request =
   | {
@@ -14,6 +15,7 @@ export type Request =
   | { kind: 'list' }
   | { kind: 'status'; containerName: string }
   | { kind: 'restart'; containerName: string; build?: boolean }
+  | { kind: 'secrets-patch'; containerName: string; patch: { channels: { kakaotalk: KakaoChannelBlock } } }
   | { kind: 'http-info' }
   | { kind: 'version' }
   | { kind: 'shutdown' }
@@ -35,6 +37,11 @@ export type RestartResult = {
   scheduled: true
 }
 
+export type SecretsPatchResult = {
+  containerName: string
+  patched: true
+}
+
 export type HttpInfoResult = {
   port: number
 }