typeclaw 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeclaw",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "homepage": "https://github.com/typeclaw/typeclaw#readme",
   "bugs": {
     "url": "https://github.com/typeclaw/typeclaw/issues"

package/src/config/config.ts

@@ -104,6 +104,25 @@ export const gitignoreSchema = z
 
 export type GitignoreConfig = z.infer<typeof gitignoreSchema>
 
+const IPV4_CIDR_PATTERN = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(?:\/(\d{1,2}))?$/
+
+const ipv4CidrSchema = z.string().refine(
+  (value) => {
+    const match = IPV4_CIDR_PATTERN.exec(value)
+    if (!match) return false
+    const octets = [match[1], match[2], match[3], match[4]].map(Number)
+    if (octets.some((n) => !Number.isInteger(n) || n < 0 || n > 255)) return false
+    if (match[5] !== undefined) {
+      const prefix = Number(match[5])
+      if (!Number.isInteger(prefix) || prefix < 0 || prefix > 32) return false
+    }
+    return true
+  },
+  {
+    message: 'network.allow entries must be IPv4 addresses or CIDR ranges (e.g. "10.0.0.0/16", "10.0.0.2")',
+  },
+)
+
 // `blockInternal` is the kill-switch for the container-stage egress filter
 // installed by Dockerfile entrypoint shim: when true, the container is granted
 // CAP_NET_ADMIN at boot just long enough to install iptables OUTPUT rules
@@ -124,11 +143,38 @@ export type GitignoreConfig = z.infer<typeof gitignoreSchema>
 // 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.
+//
+// `autoAllowResolvers` (default `true`) makes the shim narrowly carve out
+// the container's DNS resolvers — every `nameserver` line in
+// `/etc/resolv.conf` gets a `udp/tcp --dport 53` ACCEPT inserted BEFORE the
+// REJECT rules. This fixes the canonical EC2/GCE/Azure footgun: cloud VPC
+// resolvers live inside RFC1918 (e.g. AWS VPC DNS at `10.0.0.2`), so
+// `blockInternal: true` would otherwise kill every DNS lookup the agent
+// makes. The carve-out is scoped to port 53 only — a compromised agent
+// cannot reach the resolver host on any other port. On a laptop where
+// `/etc/resolv.conf` points at a public resolver (1.1.1.1, 8.8.8.8), the
+// generated ACCEPT rules are no-ops because public IPs are not in the
+// block list to begin with. Opt-out (`false`) is for users who explicitly
+// configure DNS via `.env` (e.g. `DOCKER_DNS=1.1.1.1`) and want a fully
+// closed filter.
+//
+// `allow` is the power-user escape hatch: an explicit list of IPv4 CIDRs
+// or bare IPv4 addresses that punch through the block list wholesale (all
+// ports, all protocols). Use case: VPC-private services the agent must
+// reach by IP — internal APIs, RDS endpoints, VPC interface endpoints for
+// S3/Bedrock. Each entry inserts an unscoped `iptables -A OUTPUT -d <cidr>
+// -j ACCEPT` before the REJECT rules. IPv4 only: the carve-out is for
+// destinations the operator names explicitly, and every cloud VPC we
+// support is IPv4-routable. Validation at parse time rejects non-CIDR
+// strings, IPv6 forms, and out-of-range octets so a typo in
+// `typeclaw.json` surfaces immediately instead of at container boot.
 export const networkSchema = z
   .object({
     blockInternal: z.boolean().default(true),
+    autoAllowResolvers: z.boolean().default(true),
+    allow: z.array(ipv4CidrSchema).default([]),
   })
-  .default({ blockInternal: true })
+  .default({ blockInternal: true, autoAllowResolvers: true, allow: [] })
 
 export type NetworkConfig = z.infer<typeof networkSchema>
 

package/src/container/index.ts

@@ -17,6 +17,8 @@ export {
 } from './shared'
 export {
   planStart,
+  refreshDockerfile,
+  refreshGitignore,
   start,
   type HostDaemonStatus,
   type PlanStartOptions,

package/src/container/start.ts

@@ -424,9 +424,16 @@ export async function planStart({
   // bounding set via setpriv before exec'ing the agent — see the shim source
   // in src/init/dockerfile.ts for the full handoff. The `-e` flag is what
   // tells the shim to take the on-path; absent or set to anything other than
-  // "1", the shim is a no-op.
+  // "1", the shim is a no-op. `autoAllowResolvers` / `allow` envs are only
+  // emitted on the on-path because the shim's off-path doesn't read them;
+  // `TYPECLAW_NETWORK_ALLOW` is comma-joined to match the shim's `IFS=','`
+  // loop, and CIDR validation already happened at config parse time.
   if (cfg.network.blockInternal) {
     runArgs.push('--cap-add=NET_ADMIN', '-e', 'TYPECLAW_NETWORK_BLOCK_INTERNAL=1')
+    runArgs.push('-e', `TYPECLAW_NETWORK_AUTO_ALLOW_RESOLVERS=${cfg.network.autoAllowResolvers ? '1' : '0'}`)
+    if (cfg.network.allow.length > 0) {
+      runArgs.push('-e', `TYPECLAW_NETWORK_ALLOW=${cfg.network.allow.join(',')}`)
+    }
   }
 
   if (hostdControl) {

package/src/doctor/checks.ts

@@ -1,5 +1,5 @@
 import { existsSync, mkdirSync } from 'node:fs'
-import { readFile, writeFile } from 'node:fs/promises'
+import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join, relative } from 'node:path'
 
@@ -10,10 +10,13 @@ import {
   defaultDockerExec,
   imageTagFromCwd,
   inspectContainer,
+  refreshDockerfile,
+  refreshGitignore,
   resolveHostPort,
   type DockerExec,
 } from '@/container'
 import { isDaemonReachable, send } from '@/hostd'
+import { resolveBaseImageVersion } from '@/init/cli-version'
 import { buildDockerfile, DOCKERFILE } from '@/init/dockerfile'
 import { detectMissingDeps } from '@/init/ensure-deps'
 import { buildGitignore, GITIGNORE_FILE } from '@/init/gitignore'
@@ -33,7 +36,6 @@ export function buildStaticChecks(opts: { dockerExec?: DockerExec } = {}): Docto
     agentFolderDockerfileTemplate(),
     agentFolderGitignoreTemplate(),
     agentFolderNodeModules(),
-    agentFolderEnvFile(),
     agentFolderGitRepo(),
     configValid(),
     hostdHomeWritable(),
@@ -152,7 +154,7 @@ function agentFolderDockerfileTemplate(): DoctorCheck {
         fix: {
           description: 'Regenerate the Dockerfile from the typeclaw template.',
           autoFix: async () => {
-            await writeAtomic(dockerfilePath, expected)
+            await refreshDockerfile(ctx.cwd)
             return { summary: 'refreshed Dockerfile from template', changedPaths: [DOCKERFILE] }
           },
         },
@@ -181,7 +183,7 @@ function agentFolderGitignoreTemplate(): DoctorCheck {
         fix: {
           description: 'Regenerate .gitignore from the typeclaw template.',
           autoFix: async () => {
-            await writeAtomic(gitignorePath, expected)
+            await refreshGitignore(ctx.cwd)
             return { summary: 'refreshed .gitignore from template', changedPaths: [GITIGNORE_FILE] }
           },
         },
@@ -209,24 +211,6 @@ function agentFolderNodeModules(): DoctorCheck {
   }
 }
 
-function agentFolderEnvFile(): DoctorCheck {
-  return {
-    name: 'agent-folder.env-file',
-    category: 'agent-folder',
-    description: '.env file is present',
-    applies: (ctx) => ctx.hasAgentFolder,
-    async run(ctx) {
-      if (existsSync(join(ctx.cwd, '.env'))) return { status: 'ok', message: '.env present' }
-      return {
-        status: 'warning',
-        message: '.env is missing',
-        details: ['Channels and external API integrations will not have their secrets injected.'],
-        fix: { description: 'Create a .env file with the credentials your agent needs.' },
-      }
-    },
-  }
-}
-
 function agentFolderGitRepo(): DoctorCheck {
   return {
     name: 'agent-folder.git-repo',
@@ -384,7 +368,7 @@ function buildExpectedDockerfile(cwd: string): string | null {
   try {
     const cfg = loadConfigStrictForTemplate(cwd)
     if (cfg === null) return null
-    return buildDockerfile(cfg.dockerfile)
+    return buildDockerfile(cfg.dockerfile, { baseImageVersion: resolveBaseImageVersion(cwd) })
   } catch {
     return null
   }
@@ -417,10 +401,6 @@ async function safeRead(path: string): Promise<string | null> {
   }
 }
 
-async function writeAtomic(path: string, content: string): Promise<void> {
-  await writeFile(path, content)
-}
-
 export function relativeToCwd(cwd: string, path: string): string {
   return relative(cwd, path) || '.'
 }

package/src/doctor/commit.ts

@@ -18,8 +18,8 @@ export async function commitAutoFixes(opts: CommitOptions): Promise<CommitOutcom
     return { kind: 'skipped', reason: 'no successful auto-fixes' }
   }
 
-  const pathsStaged = uniqueSorted(successes.flatMap((a) => a.changedPaths))
-  if (pathsStaged.length === 0) {
+  const requested = uniqueSorted(successes.flatMap((a) => a.changedPaths))
+  if (requested.length === 0) {
     return { kind: 'skipped', reason: 'auto-fixes reported no changed paths' }
   }
 
@@ -29,13 +29,23 @@ export async function commitAutoFixes(opts: CommitOptions): Promise<CommitOutcom
 
   const spawnGit = opts.spawnGit ?? defaultSpawnGit
 
+  const filter = await filterCommittable(spawnGit, opts.cwd, requested)
+  if (filter.kind === 'failed') return filter
+  const pathsStaged = filter.paths
+  if (pathsStaged.length === 0) {
+    return {
+      kind: 'skipped',
+      reason: `all changed path(s) are gitignored or untracked-and-ignored (${requested.join(', ')})`,
+    }
+  }
+
   const add = await spawnGit(['add', '--', ...pathsStaged], opts.cwd)
   if (add.exitCode !== 0) {
     return { kind: 'failed', reason: `git add failed: ${add.stderr.trim() || `exit ${add.exitCode}`}` }
   }
 
   const message = buildCommitMessage(opts.attempts)
-  const commit = await spawnGit(['commit', '-m', message], opts.cwd)
+  const commit = await spawnGit(['commit', '-m', message, '--only', '--', ...pathsStaged], opts.cwd)
   if (commit.exitCode !== 0) {
     return { kind: 'failed', reason: `git commit failed: ${commit.stderr.trim() || `exit ${commit.exitCode}`}` }
   }
@@ -45,6 +55,37 @@ export async function commitAutoFixes(opts: CommitOptions): Promise<CommitOutcom
   return { kind: 'committed', commitSha, pathsStaged }
 }
 
+// TypeClaw-owned files like `Dockerfile` live in the "truly-ignored" gitignore
+// category — they're regenerated from the CLI template on every `typeclaw
+// start`, so tracking them would produce noisy "Update Dockerfile" commits.
+// `commitSystemFile` in src/container/start.ts skips them silently because
+// `git status --porcelain -- <ignored>` returns empty. We replicate that
+// behavior here so `doctor --fix` produces the same skip semantics instead
+// of failing with `git add` hints about the ignored file.
+//
+// A non-zero git-status exit IS NOT the same signal as 'empty stdout' — the
+// former means git itself failed (broken index, malformed pathspec, etc.).
+// Surface that as { kind: 'failed' } so the user sees the real cause instead
+// of a misleading 'all paths are gitignored' message.
+async function filterCommittable(
+  spawnGit: SpawnGit,
+  cwd: string,
+  paths: string[],
+): Promise<{ kind: 'ok'; paths: string[] } | { kind: 'failed'; reason: string }> {
+  const out: string[] = []
+  for (const p of paths) {
+    const status = await spawnGit(['status', '--porcelain', '--', p], cwd)
+    if (status.exitCode !== 0) {
+      return {
+        kind: 'failed',
+        reason: `git status failed for ${p}: ${status.stderr.trim() || `exit ${status.exitCode}`}`,
+      }
+    }
+    if (status.stdout.trim().length > 0) out.push(p)
+  }
+  return { kind: 'ok', paths: out }
+}
+
 export function buildCommitMessage(attempts: FixAttempt[]): string {
   const successes = attempts.filter((a): a is Extract<FixAttempt, { ok: true }> => a.ok === true)
   const subject = `typeclaw doctor: auto-fix ${successes.length} issue${successes.length === 1 ? '' : 's'}`

package/src/doctor/plugin-bridge.ts

@@ -88,7 +88,13 @@ async function dial(opts: PluginBridgeOptions): Promise<DialResult> {
   const ws = new WebSocket(url)
   try {
     await new Promise<void>((resolve, reject) => {
+      // `timer` is declared up front so `cleanup` can reference it without
+      // hitting the TDZ if the WS fires a synchronous error event during
+      // addEventListener (theoretical, but const-after-cleanup-definition
+      // would throw ReferenceError instead of being the intended no-op).
+      let timer: ReturnType<typeof setTimeout> | undefined
       const cleanup = () => {
+        if (timer !== undefined) clearTimeout(timer)
         ws.removeEventListener('open', onOpen)
         ws.removeEventListener('error', onError)
       }
@@ -100,6 +106,19 @@ async function dial(opts: PluginBridgeOptions): Promise<DialResult> {
         cleanup()
         reject(err instanceof Error ? err : new Error(`failed to connect to ${url}`))
       }
+      // Bun's WebSocket has no built-in connect timeout. Without this, a TCP
+      // handshake that completes but never produces an Upgrade response
+      // (e.g. a wedged docker/orbstack port-forward) leaves the WS stuck in
+      // CONNECTING forever — neither 'open' nor 'error' ever fires, and
+      // `typeclaw doctor` hangs. The per-request timeout downstream doesn't
+      // help because we never reach it.
+      timer = setTimeout(() => {
+        cleanup()
+        try {
+          ws.close()
+        } catch {}
+        reject(new Error(`websocket connect timeout after ${timeoutMs}ms`))
+      }, timeoutMs)
       ws.addEventListener('open', onOpen, { once: true })
       ws.addEventListener('error', onError, { once: true })
     })

package/src/init/dockerfile.ts

@@ -132,6 +132,44 @@ export const NETWORK_BLOCK_IPV6_NETS = ['fc00::/7', 'fe80::/10', 'ff00::/8', '::
 // `set -eu` propagates rule-install failures up to PID 1 exit, which kills
 // the container. Failing closed is the right thing: an unenforced
 // blockInternal=true is worse than blockInternal=false.
+//
+// Carve-out ordering is load-bearing. iptables OUTPUT is first-match-wins,
+// and we use -A (append). So the order written into the shim is the order
+// rules will be evaluated:
+//   1. loopback ACCEPT
+//   2. hostd port ACCEPT (narrow: tcp + single dport on the host gateway)
+//   3. resolver ACCEPT (narrow: udp/tcp dport 53 to each /etc/resolv.conf
+//      nameserver) — gated on TYPECLAW_NETWORK_AUTO_ALLOW_RESOLVERS=1
+//   4. user-supplied allowlist ACCEPT (wholesale: -d <cidr>) — driven by
+//      TYPECLAW_NETWORK_ALLOW comma-separated env
+//   5. RFC1918 + link-local + CGNAT + multicast + reserved REJECTs
+// A resolver at 10.0.0.2 hits (3) and ACCEPTs before (5) DROPs it.
+//
+// The resolver carve-out reads /etc/resolv.conf inside the container, NOT
+// on the host. Docker propagates the host's resolver into the container by
+// default (Docker Desktop and OrbStack rewrite it to the embedded DNS
+// proxy at 127.0.0.11; Docker on Linux copies the host's resolv.conf
+// verbatim unless --dns is passed). On Docker Desktop / OrbStack the
+// nameserver is loopback and the rule is a no-op (loopback is already
+// ACCEPT'd by rule 1). On native Linux + EC2/GCE/Azure VMs, the
+// nameserver is the VPC resolver inside RFC1918 — exactly the case this
+// carve-out targets.
+//
+// `awk '/^nameserver/{print $2}'` extracts only the IP, skipping
+// comments, `search`, `options`, and malformed lines. We don't validate
+// the IP further: a malformed nameserver line would have crashed glibc's
+// resolver long before the shim ran, so we trust resolv.conf's contents.
+// IPv6 nameservers (rare in practice, never the case on EC2/GCE/Azure)
+// are skipped by `grep -v ':'` to avoid feeding a v6 address to iptables.
+// `iptables -C` (check) is intentionally NOT used to dedupe — duplicate
+// ACCEPT rules are harmless (still first-match-wins), and the check
+// flag's exit code is hard to reason about under `set -e`.
+//
+// The user-supplied allowlist (TYPECLAW_NETWORK_ALLOW) is splat on
+// commas. Each entry is fed directly to iptables -d, which accepts both
+// bare IPs and CIDR notation. Validation already happened in config.ts at
+// parse time, so the shim trusts the env. Empty env → loop body never
+// runs, zero ACCEPT rules added.
 export function buildEntrypointShim(): string {
   const ipv4Rules = NETWORK_BLOCK_IPV4_NETS.map(
     (net) => `iptables -A OUTPUT -d ${net} -j REJECT --reject-with icmp-port-unreachable`,
@@ -162,6 +200,26 @@ if [ -n "\${hostd_port:-}" ]; then
     iptables -A OUTPUT -p tcp -d "$host_gw_ip" --dport "$hostd_port" -j ACCEPT
   fi
 fi
+
+# Resolver carve-out: parse /etc/resolv.conf nameservers and ACCEPT
+# udp+tcp dport 53 to each. Gated on TYPECLAW_NETWORK_AUTO_ALLOW_RESOLVERS=1.
+if [ "\${TYPECLAW_NETWORK_AUTO_ALLOW_RESOLVERS:-0}" = "1" ] && [ -r /etc/resolv.conf ]; then
+  for ns in $(awk '/^[[:space:]]*nameserver[[:space:]]+/{print $2}' /etc/resolv.conf | grep -v ':' || true); do
+    iptables -A OUTPUT -p udp -d "$ns" --dport 53 -j ACCEPT
+    iptables -A OUTPUT -p tcp -d "$ns" --dport 53 -j ACCEPT
+  done
+fi
+
+# User-supplied allowlist carve-out: comma-separated CIDRs/IPs from
+# TYPECLAW_NETWORK_ALLOW. Already validated at config-parse time.
+if [ -n "\${TYPECLAW_NETWORK_ALLOW:-}" ]; then
+  IFS=','
+  for cidr in $TYPECLAW_NETWORK_ALLOW; do
+    [ -z "$cidr" ] && continue
+    iptables -A OUTPUT -d "$cidr" -j ACCEPT
+  done
+  unset IFS
+fi
 ${ipv4Rules.join('\n')}
 
 ip6tables -A OUTPUT -o lo -j ACCEPT

package/typeclaw.schema.json

@@ -708,13 +708,26 @@
     },
     "network": {
       "default": {
-        "blockInternal": true
+        "blockInternal": true,
+        "autoAllowResolvers": true,
+        "allow": []
       },
       "type": "object",
       "properties": {
         "blockInternal": {
           "default": true,
           "type": "boolean"
+        },
+        "autoAllowResolvers": {
+          "default": true,
+          "type": "boolean"
+        },
+        "allow": {
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       }
     },