pig-claude-bridge 0.2.1 → 0.4.0

package/README.md

@@ -32,7 +32,19 @@ Behind the scenes, PiG's tools are bridged to Claude Code but everything works l
 
 The model list is a static table generated from the Anthropic catalog of `@earendil-works/pi-ai` 1.2.0 (`scripts/dev/gen-catalog.mjs`) and registered when the extension loads; it does not follow later catalog updates. Dated snapshot ids are not shown. See [docs/compatibility.md](docs/compatibility.md) (D5).
 
-**1M context:** Fable 5/5.1, Opus 5.5/5/4.8/4.7, and Sonnet 5.5/5 get 1M context. Opus 4.6 gets 1M only on a Max plan or with Extra Usage, and Sonnet 4.6 only with Extra Usage: set `provider.plan` and/or `provider.longContextExtraUsage` as described in [Configuration](#configuration).
+**1M context:** Fable 5/5.1, Opus 5.5/5/4.8/4.7, and Sonnet 5.5/5 get 1M context. Opus 4.6 gets 1M on Max, Ultra, Team (Standard and Premium seats) and Enterprise plans or with Extra Usage, and Sonnet 4.6 only with Extra Usage ([Claude Code docs](https://code.claude.com/docs/en/model-config#extended-context)): the extension detects the plan by itself (see `provider.plan` in [Configuration](#configuration)); set `provider.longContextExtraUsage` for Extra Usage.
+
+**Fast mode:** `/claude-fast` turns Claude Code's fast mode on or off for the rest of the session (`/claude-fast on`, `/claude-fast off`, or no argument to toggle); set `provider.fastMode` to `true` to start every session with it on. It takes effect from the next turn, on models that have fast mode (Opus 5.5, for example); other models ignore it. On subscription plans fast mode is billed to usage credits, not to the plan's limits, and on Team and Enterprise an Owner has to enable it for the organization first ([Claude Code docs](https://code.claude.com/docs/en/fast-mode)). While it is on, the footer shows `fast` (see [Footer status](#footer-status)).
+
+### Footer status
+
+The bridge keeps one entry in PiG's footer status bar, for example `Claude Max · fast · 5h 6% ↻3h · 7d 76% ↻8h · Fable 99% ↻8h`:
+
+- the plan (`Pro`, `Max`, `Ultra`, `Team`, `Enterprise`), when `provider.plan` is set or the plan was detected; nothing when it is unknown.
+- `fast` while fast mode is on; nothing when it is off.
+- the plan's usage limits, once Claude Code reports them (see [Plan usage for footers and quota extensions](#plan-usage-for-footers-and-quota-extensions)).
+
+The plan shows from session start, fast mode as soon as `/claude-fast` changes it, and the usage after the first turn.
 
 ## AskClaude Tool
 
@@ -57,6 +69,7 @@ The extension asks PiG for both directories; nothing is hard-coded. A missing or
   },
   "provider": {
     "plan": "max",
+    "fastMode": false,
     "longContextExtraUsage": false,
     "strictMcpConfig": true,
     "pathToClaudeCodeExecutable": "/home/you/.nix-profile/bin/claude"
@@ -75,14 +88,15 @@ The extension asks PiG for both directories; nothing is hard-coded. A missing or
 - `appendSkills`: forward PiG's skills block into the system prompt (default `true`)
 
 `provider`:
-- `plan` (default `"pro"`): set to `"max"` if you have a Max (or Team Premium/Enterprise) Anthropic plan. This enables Opus with 1M context.
+- `plan`: `"pro"`, `"max"`, `"ultra"`, `"team"` or `"enterprise"`. Every plan except `"pro"` enables Opus 4.6 with 1M context. Unset, the extension asks `claude auth status --json` once at load and uses the subscription it reports; when that fails (no `claude` on `PATH`, not logged in, or an API key login) it falls back to `"pro"`.
+- `fastMode` (default `false`): start every session with Claude Code's fast mode on. `/claude-fast` changes it for the current session.
 - `longContextExtraUsage`: set to `true` to enable 1M context models even if they cost money through Extra Usage on your plan. It enables Sonnet 4.6 with 1M on every plan and Opus 4.6 with 1M on Pro.
 - `forceTwoHundredK`: array of model ids to pin to 200K context (bare id, no `[1m]` suffix). Use if the catalog declares a model at 1M but Claude Code won't serve it on your plan.
 - `strictMcpConfig`: block MCP servers from `~/.claude.json` / `.mcp.json` (default `true`). Cloud MCP (Gmail/Drive via claude.ai OAuth) is always blocked.
 - `autoMemoryEnabled`: enable Claude Code's auto-memory system (default `false`)
 - `pathToClaudeCodeExecutable`: path to the `claude` binary, used instead of the one on `PATH`. A path ending in `.js`, `.mjs` or `.ts` is run through `node`, as the Agent SDK does.
 
-**Notices:** the startup notice, shown at the first bridge turn in the TUI only (it stays pending in RPC, JSON and print mode), points out when `provider.plan` is unset and records `startupNoticeShown` (a date) in the global config. A deprecation notice on first use of AskClaude records its display date as `askClaudeDeprecationShown`. The extension rewrites the global file only to add these keys and leaves every other key as it was; an unparseable global file is left alone.
+**Notices:** the startup notice, shown at the first bridge turn in the TUI only (it stays pending in RPC, JSON and print mode), points out when `provider.plan` is unset and was not detected, and records `startupNoticeShown` (a date) in the global config. A deprecation notice on first use of AskClaude records its display date as `askClaudeDeprecationShown`. The extension rewrites the global file only to add these keys and leaves every other key as it was; an unparseable global file is left alone.
 
 ## Why Go
 
@@ -166,7 +180,7 @@ PiG runs compaction and branch summaries natively. The bridge routes their `cach
 
 ### Plan usage for footers and quota extensions
 
-Claude Code sends a `rate_limit_event` when a usage window changes. The TypeScript bridge passes it to Pi's `after_provider_response` event as `anthropic-ratelimit-unified-*` headers. PiG's host does not emit that event, so this port writes the headers to the debug log only; the user-visible rate-limit notices stay. The bridge also shows the plan's limits in PiG's footer status bar, for example `Claude 5h 6% ↻3h · 7d 76% ↻8h · Fable 99% ↻8h · reset available`. On each event it asks Claude Code for its `/usage` rows (`get_usage`), which name per-model limits; when that fails it shows the event's own windows. This is difference D1 in [docs/compatibility.md](docs/compatibility.md).
+Claude Code sends a `rate_limit_event` when a usage window changes. The TypeScript bridge passes it to Pi's `after_provider_response` event as `anthropic-ratelimit-unified-*` headers. PiG's host does not emit that event, so this port writes the headers to the debug log only; the user-visible rate-limit notices stay. The bridge also shows the plan's limits in PiG's footer status bar, after the plan and fast mode (see [Footer status](#footer-status)), for example `Claude Max · 5h 6% ↻3h · 7d 76% ↻8h · Fable 99% ↻8h · reset available`. On each event it asks Claude Code for its `/usage` rows (`get_usage`), which name per-model limits; when that fails it shows the event's own windows. This is difference D1 in [docs/compatibility.md](docs/compatibility.md).
 
 ## Known issues
 
@@ -176,6 +190,8 @@ Claude Code sends a `rate_limit_event` when a usage window changes. The TypeScri
 
 **System prompt changes mid-session may not reach the model.** Project context (AGENTS.md/CLAUDE.md), skills, and extension-written instructions are captured on the first request and reused on resume. This keeps the cached prefix stable, but later changes may not take effect until a rebuild or compaction. Start a new session if updated instructions must take effect immediately.
 
+**Claude Code's feature flags and experiments are off.** The bridge starts Claude Code with `CLAUDE_CODE_DISABLE_FEATURE_FLAGS=1` (and `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1`, which implies it), so the GrowthBook flags and A/B experiments Claude Code evaluates at startup (`tengu_*`, cached in `~/.claude.json`) all take their built-in defaults in bridge sessions. That keeps a client-side experiment (a prompt or tool tweak, a limit, a feature toggle) from changing a session unannounced; a change made on the server side of a model is outside what any client can switch off.
+
 **Exported Anthropic environment variables override the Claude Code child (pi-claude-bridge issue #107).** An exported `ANTHROPIC_BASE_URL`, `ANTHROPIC_API_KEY`, or `ANTHROPIC_AUTH_TOKEN` redirects Claude Code to that gateway and every turn fails with its auth error. Unset them for the PiG process.
 
 ## More

package/UPSTREAM.md

@@ -6,11 +6,11 @@ This extension is a Go port of [pi-claude-bridge](https://github.com/elidickinso
 
 | what | pin |
 |---|---|
-| pi-claude-bridge | `6aa276a1498e5376363f5c1f8cf04bfcaee38c93` |
+| pi-claude-bridge | `6aa276a1498e5376363f5c1f8cf04bfcaee38c93`, plus these later commits ported on their own: f502f5d (silent-turn reminder, MCP description limit), 2edde93 (interrupted-turn resume), 5c4a268 (default output style), e93d51d (parent-session env markers), 0b096a8 (thinking off). The 0.10.0 session-sync rework (#222) and the AskClaude split (0.11.0) are not ported |
 | cc-session-io | 0.4.0 (MIT), the subset the bridge imports |
 | `@anthropic-ai/claude-agent-sdk` | 0.3.310 (Claude Code 2.1.310). The protocol client was written from the SDK's public type definitions and live probes ([protocol reference](docs/reference/agent-sdk-protocol-0.3.310.md)); the SDK itself is not vendored or depended on |
 | Claude Code | 2.1.310 (`ccproto.MinVersion`) |
-| PiG SDK | `github.com/MichaelKinsy/PiG/extensions/sdk` v0.5.3 ([signatures](docs/reference/pig-sdk-signatures-v0.5.3.md)) |
+| PiG SDK | `github.com/MichaelKinsy/PiG/extensions/sdk` v0.7.0 (PiG 0.7.0); the [signatures](docs/reference/pig-sdk-signatures-v0.5.3.md) recorded at v0.5.3 still match every symbol the bridge uses |
 | `@modelcontextprotocol/sdk` | 1.29.0, only as the reference for the JSON-RPC responses the in-process MCP server must produce |
 | `@earendil-works/pi-ai` | 1.2.0, source of the generated model catalog |
 | `golang.org/x/text` | v0.43.0, for NFC normalisation of project paths |

package/docs/compatibility.md

@@ -6,11 +6,11 @@ What this port is pinned to, and every place where it differs from the TypeScrip
 
 | what | pin |
 |---|---|
-| PiG | 0.5.3 (`pig 0.5.3+1.4.0.74f46864`) |
-| PiG Go SDK | `github.com/MichaelKinsy/PiG/extensions/sdk` v0.5.3, Go 1.26 floor |
-| Claude Code | 2.1.310 (the port warns when the binary is older) |
+| PiG | 0.7.0 (`pig 0.7.0+1.5.0`) |
+| PiG Go SDK | `github.com/MichaelKinsy/PiG/extensions/sdk` v0.7.0, Go 1.26 floor |
+| Claude Code | 2.1.310 minimum (the port warns when the binary is older); verified against 2.1.319 |
 | Agent SDK protocol | `@anthropic-ai/claude-agent-sdk` 0.3.310 (Claude Code 2.1.310); [reference](reference/agent-sdk-protocol-0.3.310.md). 0.3.308 to 0.3.310 changes nothing on the wire that the bridge uses; the one new control subtype, survey feedback, is never sent |
-| pi-claude-bridge | `6aa276a`, https://github.com/elidickinson/pi-claude-bridge |
+| pi-claude-bridge | `6aa276a`, https://github.com/elidickinson/pi-claude-bridge, plus the later commits listed in [../UPSTREAM.md](../UPSTREAM.md) (see "Ported after 6aa276a" below) |
 | cc-session-io | 0.4.0 (MIT) |
 | Pi compatibility surface | pi 1.4.0 (the Pi that PiG 0.5.3 tracks) |
 | `@modelcontextprotocol/sdk` | 1.31.0 (the TypeScript declares `^1.29.0`), only as the reference for the JSON-RPC responses the in-process MCP server produces |
@@ -127,6 +127,19 @@ What this port is pinned to, and every place where it differs from the TypeScrip
 - The alternative provider for the AskClaude, image and session-resume tests must come from `CLAUDE_BRIDGE_TESTING_ALT_PROVIDER`, `CLAUDE_BRIDGE_TESTING_ALT_MODEL` and that provider's API-key variable, because every live run uses a fresh `PIG_HOME`/`PIG_CODING_AGENT_DIR` (the TypeScript suite used the real agent dir). Without them those checks skip.
 - The deadlock-check log pattern, the shutdown test (a third case for the stdin close) and the subagent test (our own agent definition, run through `@tintinweb/pi-subagents`) are adapted as listed in [verification.md](verification.md).
 
+## Ported after 6aa276a
+
+Upstream pi-claude-bridge moved on to 0.11.0 (acbe45b, 100 commits) after the pin. These were ported on their own, each with the TypeScript commit; the rest is listed below.
+
+- **Child environment (f502f5d, 2edde93).** `CLAUDE_CODE_SILENT_TURN_REMINDER=0`, `CLAUDE_CODE_MAX_MCP_DESCRIPTION_LENGTH=16384` and `CLAUDE_CODE_RESUME_INTERRUPTED_TURN_MAX_AGE_MS=1` join `CCChildEnv`. The argv snapshot predates them, so `TestArgvMatchesNodeSdkSnapshot` sets them aside and `TestBuildEnv` pins their values.
+- **Parent-session markers (e93d51d, #198).** When `CLAUDECODE` is set in PiG's environment, the parent Claude Code session's markers are dropped from the child env. The TypeScript also moved `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC` off its own `process.env`; the port never set it there.
+- **Default output style (5c4a268, #220).** The provider's `--settings` carries `outputStyle: "default"`. Pinned live by `TestOutputStyleDefaultOverridesAUserLevelOutputStyle`.
+- **Thinking off (0b096a8, #152).** No reasoning level means `--thinking=disabled` on the provider and isolated paths, for reasoning models whose `thinkingLevelMap` does not mark `off` as `null`.
+
+Port-only, with no TypeScript counterpart: **`CLAUDE_CODE_DISABLE_FEATURE_FLAGS=1`** in `CCChildEnv`. In Claude Code 2.1.319 feature-flag evaluation (`Ph()`) requires both no disable variable and telemetry on, and `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC` counts as telemetry off, so the TypeScript already runs with flags off; the explicit variable also keeps the disk cache closed should `CLAUDE_CODE_GB_DISK_CACHE_WHEN_TELEMETRY_OFF` be exported, and `TestDisableFeatureFlagsTurnsFlagEvaluationOff` pins the behaviour.
+
+Not ported from 0.10.0 and 0.11.0: the content-digest session sync (#222: forks and trims instead of rebuilds, atomic session state, `/fork` and clone continuing the parent's Claude Code session), `CLAUDE_BRIDGE_TRACE_DIR`, provider `env` from `auth.json`, the Extra Usage billing notice, the empty-tool-result placeholder (#227), Claude Code's normalised tool args (#242), the `settingSources` change that stops loading a repo's `.claude/settings*.json` (#198), the AskClaude split into its own package, and the removal of the `provider.plan` notice (the port detects the plan instead). D1 to D7 above still hold.
+
 ## Pi-only tests that are not ported
 
 The TypeScript suite has 45 `tests/unit-*.mjs` files. Those that test Pi-only wiring with no PiG counterpart are not ported:

package/extensions/pig-claude-bridge/extension.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	sdk "github.com/MichaelKinsy/PiG/extensions/sdk"
@@ -32,6 +33,12 @@ func (h sdkHost) SetStatus(key, text string) {
 	h.ctx.SetStatus(key, text)
 }
 
+// ClearStatus drops the call if the context is stale, as SetStatus does.
+func (h sdkHost) ClearStatus(key string) {
+	defer func() { _ = recover() }()
+	h.ctx.ClearStatus(key)
+}
+
 func (h sdkHost) SessionID() (string, error) { return h.ctx.SessionManager().GetSessionID() }
 func (h sdkHost) Cwd() string                { return h.ctx.Cwd() }
 
@@ -124,6 +131,17 @@ func Extension() *sdk.Extension {
 	configDirName, _ := sdk.ConfigDirName()
 	cwd, _ := os.Getwd()
 	cfg := config.Load(agentDir, cwd, configDirName)
+	// Detected before the provider registers, since the plan decides which models get 1M.
+	// Skipped outside a host, so validate-only installs and tests never spawn claude.
+	if agentDir != "" && cfg.Provider.Plan == nil {
+		plan, err := bridge.DetectPlan(context.Background(), cfg.Provider)
+		if err != nil {
+			cfg.Problems = append(cfg.Problems, fmt.Sprintf("claude-bridge: plan detection failed: %v", err))
+		}
+		if plan != "" {
+			cfg.Provider.Plan = &plan
+		}
+	}
 	b := bridge.New(bridge.Deps{
 		Config:        cfg,
 		AgentDir:      agentDir,
@@ -150,6 +168,26 @@ func Extension() *sdk.Extension {
 		"streamSimple": sdk.ProviderStreamSimpleFunc(streamSimple),
 	})
 
+	ext.Command("claude-fast", "Toggle Claude Code fast mode for this session (on|off)", func(ctx sdk.Context, args string) error {
+		host := sdkHost{ctx}
+		switch strings.TrimSpace(args) {
+		case "":
+			b.SetFastMode(host, !b.FastMode())
+		case "on":
+			b.SetFastMode(host, true)
+		case "off":
+			b.SetFastMode(host, false)
+		default:
+			return fmt.Errorf("usage: /claude-fast [on|off]")
+		}
+		state := "off"
+		if b.FastMode() {
+			state = "on (from the next turn, on models that support it)"
+		}
+		host.Notify("Claude fast mode "+state, "info")
+		return nil
+	})
+
 	if a := cfg.AskClaude; a != nil && a.Enabled != nil && *a.Enabled {
 		ext.RegisterTool(askclaude.Definition(b, cfg, agentDir,
 			func(ctx sdk.Context) bridge.Host { return sdkHost{ctx} }, requestContext))

package/extensions/pig-claude-bridge/go.mod

@@ -2,6 +2,6 @@ module github.com/balcsida/pig-claude-bridge/extensions/pig-claude-bridge
 
 go 1.26.0
 
-require github.com/MichaelKinsy/PiG/extensions/sdk v0.5.3
+require github.com/MichaelKinsy/PiG/extensions/sdk v0.7.0
 
 require golang.org/x/text v0.43.0

package/extensions/pig-claude-bridge/go.sum

@@ -1,4 +1,4 @@
-github.com/MichaelKinsy/PiG/extensions/sdk v0.5.3 h1:mgLZchfHrmjoyuKNzP5rpn/D/6hx6ZFoDfwHsqcU8Yo=
-github.com/MichaelKinsy/PiG/extensions/sdk v0.5.3/go.mod h1:4j0XhCW0EPOBWvqYE7XKjTvIAahI7K1VyyW3KpjTKj8=
+github.com/MichaelKinsy/PiG/extensions/sdk v0.7.0 h1:5esSYPrwspz6Xo6XMAVJu05qyrp/7wijF5ZqgG0x6kw=
+github.com/MichaelKinsy/PiG/extensions/sdk v0.7.0/go.mod h1:4j0XhCW0EPOBWvqYE7XKjTvIAahI7K1VyyW3KpjTKj8=
 golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc=
 golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s=

package/extensions/pig-claude-bridge/internal/bridge/askclaude.go

@@ -117,6 +117,7 @@ func (b *Bridge) PromptAndWait(ctx context.Context, host Host, r AskRequest) (te
 	// the skills block, the only channel. The preset prompt is unconditional: without it
 	// the child lacks the tool and permission guidance the bridge relies on.
 	settings := config.ClaudeCodeSettings(b.deps.Config.Provider)
+	b.applyFastMode(settings)
 	settings["claudeMdExcludes"] = claudeMdExcludes
 	debugFile, onStderr := b.cliDebugOptions("askclaude")
 	opts := ccproto.Options{

package/extensions/pig-claude-bridge/internal/bridge/hooks.go

@@ -121,6 +121,7 @@ func (b *Bridge) hostSessionID(host Host, event string) string {
 // session is a fresh conversation.
 func (b *Bridge) OnSessionStart(host Host, reason string) {
 	defer b.recoverHandler("session_start")
+	b.showStatus(host)
 	b.rememberSessionCwd(b.hostSessionID(host, "session_start"), host.Cwd())
 	switch reason {
 	case "new", "resume", "fork":

package/extensions/pig-claude-bridge/internal/bridge/host.go

@@ -71,6 +71,12 @@ type Bridge struct {
 	// captures is the prompt-capture registry, guarded by its own mutex.
 	captures    *promptcapture.Captures
 	longContext models.LongContextSettings
+	// fastMode adds fastMode to Claude Code's --settings; /claude-fast flips it mid-session.
+	fastMode atomic.Bool
+	// plan is provider.plan as configured or detected, "" when unknown; the footer shows it.
+	plan string
+	// lastUsage is the usage windows the footer last showed, guarded by mu.
+	lastUsage string
 
 	// queries tracks the goroutines a provider call starts, so a shutdown or a test
 	// can wait for them.
@@ -95,6 +101,12 @@ func New(d Deps) *Bridge {
 		cwds:             map[string]string{},
 		longContext:      LongContextSettings(d.Config.Provider),
 	}
+	if p := d.Config.Provider; p != nil && p.FastMode != nil {
+		b.fastMode.Store(*p.FastMode)
+	}
+	if p := d.Config.Provider; p != nil && p.Plan != nil {
+		b.plan = *p.Plan
+	}
 	b.captures = promptcapture.NewCaptures(0, b.debugCaptureMiss)
 	b.queueStartupNotices()
 	for _, p := range d.Config.Problems {

package/extensions/pig-claude-bridge/internal/bridge/isolated.go

@@ -100,14 +100,15 @@ func (b *Bridge) runIsolatedSummary(ctx context.Context, host Host, model, piCon
 	cwd := b.sessionCwdFor(owner)
 	cliModel := models.ClaudeCodeModelID(str(model["id"]), b.longContext)
 	effort := effortForReasoning(model, options["reasoning"])
-	b.debugf("compact summary: spawn model=%s registeredModel=%v effort=%s promptLen=%d", cliModel, model["id"], orDefault(effort), len([]rune(promptText)))
+	thinkingOff := thinkingDisabledForReasoning(model, options["reasoning"])
+	b.debugf("compact summary: spawn model=%s registeredModel=%v effort=%s thinkingDisabled=%t promptLen=%d", cliModel, model["id"], orDefault(effort), thinkingOff, len([]rune(promptText)))
 
 	if tools == nil {
 		tools = []string{}
 	}
 	debugFile, onStderr := b.cliDebugOptions(tag)
 	opts := ccproto.Options{
-		Executable: exe, Cwd: cwd, Model: cliModel, Effort: effort, MaxTurns: 1,
+		Executable: exe, Cwd: cwd, Model: cliModel, Effort: effort, ThinkingDisabled: thinkingOff, MaxTurns: 1,
 		Tools: tools, ToolsSet: true, AllowedTools: allowedTools,
 		SettingSourcesSet: true, Skills: []string{},
 		SystemPrompt: str(piContext["systemPrompt"]), SystemPromptSet: true,

package/extensions/pig-claude-bridge/internal/bridge/notices.go

@@ -1,9 +1,11 @@
 package bridge
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
+	"github.com/balcsida/pig-claude-bridge/extensions/pig-claude-bridge/internal/ccproto"
 	"github.com/balcsida/pig-claude-bridge/extensions/pig-claude-bridge/internal/config"
 	"github.com/balcsida/pig-claude-bridge/extensions/pig-claude-bridge/internal/models"
 	"github.com/balcsida/pig-claude-bridge/extensions/pig-claude-bridge/internal/promptcapture"
@@ -102,6 +104,44 @@ func LongContextSettings(p *config.ProviderConfig) models.LongContextSettings {
 	return s
 }
 
+// DetectPlan asks Claude Code for the subscription behind its login, for when provider.plan
+// is unset. A subscription the 1M rules don't know is not returned, so the notice still asks.
+func DetectPlan(ctx context.Context, p *config.ProviderConfig) (string, error) {
+	configured := ""
+	if p != nil && p.PathToClaudeCodeExecutable != nil {
+		configured = *p.PathToClaudeCodeExecutable
+	}
+	exe, err := ccproto.ResolveExecutable(configured)
+	if err != nil {
+		return "", err
+	}
+	sub, err := ccproto.SubscriptionType(ctx, exe)
+	switch sub {
+	case "pro", "max", "ultra", "team", "enterprise":
+		return sub, err
+	}
+	return "", err
+}
+
+// SetFastMode turns Claude Code's fast mode on or off from the next turn on and updates
+// host's footer; each turn spawns a fresh Claude Code, so a live query keeps the mode it
+// started with.
+func (b *Bridge) SetFastMode(host Host, on bool) {
+	b.fastMode.Store(on)
+	b.showStatus(host)
+}
+
+// FastMode reports whether the next turn asks Claude Code for fast mode.
+func (b *Bridge) FastMode() bool { return b.fastMode.Load() }
+
+// applyFastMode opts settings into fast mode. Claude Code under the SDK keeps fast mode off
+// (sdk_opt_in_required) unless --settings carries fastMode; a model without fast mode ignores it.
+func (b *Bridge) applyFastMode(settings map[string]any) {
+	if b.fastMode.Load() {
+		settings["fastMode"] = true
+	}
+}
+
 // reasoningToEffort maps pi reasoning levels to Claude Code effort levels.
 var reasoningToEffort = map[string]string{
 	"minimal": "low", "low": "low", "medium": "medium", "high": "high", "xhigh": "max", "max": "max",
@@ -115,6 +155,21 @@ var validEfforts = map[string]bool{"low": true, "medium": true, "high": true, "x
 // the level is unsupported on that model: no effort is sent, so Claude Code's own
 // default applies. A map value is trusted only when it names a level Claude Code
 // accepts. "" means no effort.
+// thinkingDisabledForReasoning reports whether Claude Code should be told thinking is off. PiG
+// sends no reasoning level when thinking is off, and Claude Code then applies its own default
+// (thinking on). As pi-ai's Anthropic provider: only for reasoning models, and not when the
+// model's thinkingLevelMap marks "off" unsupported (null), as on models that always think.
+func thinkingDisabledForReasoning(model map[string]any, reasoning any) bool {
+	if level, _ := reasoning.(string); level != "" {
+		return false
+	}
+	if on, _ := model["reasoning"].(bool); !on {
+		return false
+	}
+	off, present := obj(model["thinkingLevelMap"])["off"]
+	return !(present && off == nil)
+}
+
 func effortForReasoning(model map[string]any, reasoning any) string {
 	level, _ := reasoning.(string)
 	if level == "" {

package/extensions/pig-claude-bridge/internal/bridge/provider.go

@@ -347,10 +347,14 @@ func (b *Bridge) freshQuery(ctx context.Context, host Host, stream *sdk.ModelEve
 	settings := config.ClaudeCodeSettings(providerSettings)
 	settings["claudeMdExcludes"] = claudeMdExcludes
 	settings["includeGitInstructions"] = false
+	// A user's output style is persona text written for standalone Claude Code; PiG owns the persona here.
+	settings["outputStyle"] = "default"
+	b.applyFastMode(settings)
 	debugFile, onStderr := b.cliDebugOptions("provider")
 	opts := ccproto.Options{
 		Executable: exe, Cwd: cwd, Effort: effort, Resume: syncResult.SessionID,
-		Tools: []string{}, ToolsSet: true, PermissionMode: "bypassPermissions", IncludePartialMessages: true,
+		ThinkingDisabled: thinkingDisabledForReasoning(model, options["reasoning"]),
+		Tools:            []string{}, ToolsSet: true, PermissionMode: "bypassPermissions", IncludePartialMessages: true,
 		Settings: settings, DebugFile: debugFile, AppendSystemPrompt: systemPromptAppend, ExtraArgs: extraArgs,
 	}
 	handlers := ccproto.Handlers{OnStderr: onStderr}

package/extensions/pig-claude-bridge/internal/bridge/ratelimit.go

@@ -212,15 +212,18 @@ func (b *Bridge) handleRateLimitEvent(host Host, q *QueryContext, info RateLimit
 
 // showUsage puts the plan's usage in the footer status. The event's windows lack the
 // per-model limits' names, so it asks the live CLI for its /usage rows and falls back
-// to the windows when there is no client or the CLI does not answer.
+// to the windows when there is no client or the CLI does not answer. An empty usage
+// keeps the last one shown.
 func (b *Bridge) showUsage(host Host, client ccproto.Client, windows map[string]*UsageWindow) {
-	s, ok := host.(StatusSetter)
-	if !ok {
+	if _, ok := host.(StatusSetter); !ok {
 		return
 	}
-	set := func(status string) {
-		if status != "" {
-			s.SetStatus(UsageStatusKey, status)
+	set := func(usage string) {
+		if usage != "" {
+			b.mu.Lock()
+			b.lastUsage = usage
+			b.mu.Unlock()
+			b.showStatus(host)
 		}
 	}
 	if client == nil {
@@ -242,13 +245,43 @@ func (b *Bridge) showUsage(host Host, client ccproto.Client, windows map[string]
 	}()
 }
 
-// UsageStatusKey is the footer status entry that shows the plan's usage windows.
+// UsageStatusKey is the footer status entry that shows the plan, fast mode and usage windows.
 const UsageStatusKey = "claude-usage"
 
 // StatusSetter is a Host that can show a footer status; hosts without one skip it.
-type StatusSetter interface{ SetStatus(key, text string) }
+type StatusSetter interface {
+	SetStatus(key, text string)
+	ClearStatus(key string)
+}
 
-// usageStatus renders the unified windows as "Claude 5h 14% ↻3h · 7d 1% ↻2d", or ""
+// showStatus renders the footer entry as "Claude Max · fast · 5h 6% ↻3h · 7d 76% ↻8h": the
+// plan when configured or detected, "fast" while fast mode is on, then the last usage
+// windows. With none of the three the entry is removed.
+func (b *Bridge) showStatus(host any) {
+	s, ok := host.(StatusSetter)
+	if !ok {
+		return
+	}
+	var parts []string
+	if b.plan != "" {
+		parts = append(parts, strings.ToUpper(b.plan[:1])+b.plan[1:])
+	}
+	if b.fastMode.Load() {
+		parts = append(parts, "fast")
+	}
+	b.mu.Lock()
+	if b.lastUsage != "" {
+		parts = append(parts, b.lastUsage)
+	}
+	b.mu.Unlock()
+	if len(parts) == 0 {
+		s.ClearStatus(UsageStatusKey)
+		return
+	}
+	s.SetStatus(UsageStatusKey, "Claude "+strings.Join(parts, " · "))
+}
+
+// usageStatus renders the unified windows as "5h 14% ↻3h · 7d 1% ↻2d", or ""
 // when no window carries a utilization.
 func usageStatus(windows map[string]*UsageWindow, now time.Time) string {
 	var parts []string
@@ -267,10 +300,7 @@ func usageStatus(windows map[string]*UsageWindow, now time.Time) string {
 		}
 		parts = append(parts, fmt.Sprintf("%s %d%%", label, int(math.Floor(*w.Utilization*100+0.5)))+resetsIn(resetsAt, now))
 	}
-	if len(parts) == 0 {
-		return ""
-	}
-	return "Claude " + strings.Join(parts, " · ")
+	return strings.Join(parts, " · ")
 }
 
 // resetsIn is " ↻3h": the time to a window's reset, floored to its largest unit as the
@@ -307,7 +337,7 @@ type usageReply struct {
 }
 
 // planUsageStatus renders a get_usage reply as
-// "Claude 5h 6% ↻3h · 7d 76% ↻8h · Fable 99% ↻8h", plus "reset available" when the
+// "5h 6% ↻3h · 7d 76% ↻8h · Fable 99% ↻8h", plus "reset available" when the
 // account holds an unused rate-limit reset. "" when the reply has no windows.
 func planUsageStatus(raw json.RawMessage, now time.Time) string {
 	var r usageReply
@@ -331,7 +361,7 @@ func planUsageStatus(raw json.RawMessage, now time.Time) string {
 	if holdsUnusedReset(r.RateLimits.CedarEmber) {
 		parts = append(parts, "reset available")
 	}
-	return "Claude " + strings.Join(parts, " · ")
+	return strings.Join(parts, " · ")
 }
 
 // holdsUnusedReset reports whether the usage reply's cedar_ember block (the reset

package/extensions/pig-claude-bridge/internal/ccproto/args.go

@@ -12,11 +12,44 @@ import (
 // sdkVersion is the Node Agent SDK version whose behaviour is mirrored.
 const sdkVersion = "0.3.310"
 
-// CCChildEnv is applied to every Claude Code child (index.ts CC_CHILD_ENV).
+// CCChildEnv is applied to every Claude Code child (index.ts CC_CHILD_ENV, plus the entries
+// pi-claude-bridge added in f502f5d and 2edde93, and CLAUDE_CODE_DISABLE_FEATURE_FLAGS, which is this port's own).
 var CCChildEnv = map[string]string{
 	"ENABLE_CLAUDEAI_MCP_SERVERS": "0",
 	"DISABLE_AUTO_COMPACT":        "1",
 	"CLAUDE_CODE_ELEGANT_MEADOW":  "0",
+	// On Opus 5.5, Fable 5.1, Mythos 5.1 and Sonnet 5.5, Claude Code adds "The user hasn't heard from
+	// you in a while..." after 5 assistant messages with no visible text. PiG decides what the model is
+	// told; the message is not in PiG's history and the user never sees it.
+	"CLAUDE_CODE_SILENT_TURN_REMINDER": "0",
+	// Claude Code cuts MCP tool descriptions mid-sentence at 4096 chars; 16384 is its own larger limit.
+	"CLAUDE_CODE_MAX_MCP_DESCRIPTION_LENGTH": "16384",
+	// A resumed session that ends at a tool result reads to Claude Code as an interrupted turn, and behind
+	// a server flag it inserts a "Continue from where you left off." user message ahead of PiG's prompt.
+	// PiG supplies every prompt, so every turn counts as too old to resume.
+	"CLAUDE_CODE_RESUME_INTERRUPTED_TURN_MAX_AGE_MS": "1",
+	// No GrowthBook feature flags or experiments (tengu_*): every flag takes its built-in default, and the
+	// cached assignments in ~/.claude.json are not read either. CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+	// already implies this in 2.1.319 (flag evaluation is off whenever telemetry is); the explicit
+	// variable pins it. Pinned by TestDisableFeatureFlagsTurnsFlagEvaluationOff.
+	"CLAUDE_CODE_DISABLE_FEATURE_FLAGS": "1",
+}
+
+// EnvAddedAfterSnapshot lists the CCChildEnv keys that testdata/sdk-argv-snapshot.json (recorded at
+// pi-claude-bridge 6aa276a) does not have: added upstream later (f502f5d, 2edde93) or by this port
+// (CLAUDE_CODE_DISABLE_FEATURE_FLAGS). Snapshot tests set them aside; TestBuildEnv pins their values.
+var EnvAddedAfterSnapshot = []string{"CLAUDE_CODE_SILENT_TURN_REMINDER", "CLAUDE_CODE_MAX_MCP_DESCRIPTION_LENGTH",
+	"CLAUDE_CODE_RESUME_INTERRUPTED_TURN_MAX_AGE_MS", "CLAUDE_CODE_DISABLE_FEATURE_FLAGS"}
+
+// parentSessionVars are set by Claude Code on its own child processes, or exported by that parent. When PiG
+// runs inside a Claude Code session they describe that session, not ours: the SDK stamps its own entrypoint
+// and version only when they are unset, and Claude Code's Bash tool runs CLAUDE_ENV_FILE's script.
+// AI_AGENT is left alone. Dropped only when CLAUDECODE says PiG was started from inside Claude Code (index.ts e93d51d).
+var parentSessionVars = []string{
+	"CLAUDECODE", "CLAUDE_CODE_CHILD_SESSION", "CLAUDE_CODE_SESSION_ID", "CLAUDE_CODE_SESSION_ATTENDED",
+	"CLAUDE_PID", "CLAUDE_EFFORT", "TRACEPARENT", "CLAUDE_CODE_INVOKED_SKILLS", "CLAUDE_ENV_FILE",
+	"CLAUDE_CODE_ENTRYPOINT", "CLAUDE_AGENT_SDK_VERSION", "CLAUDE_CODE_EXECPATH",
+	"CLAUDE_CODE_SSE_PORT", "CLAUDE_CODE_MESSAGING_SOCKET", "CLAUDE_CODE_MESSAGING_TOKEN",
 }
 
 // ExtraArg is one extraArgs entry; a nil Value emits the bare flag.
@@ -32,7 +65,10 @@ type Options struct {
 	// Model is the SDK's model option (--model=<id>). The provider and AskClaude pass their
 	// model through ExtraArgs instead (two tokens, as the TypeScript's extraArgs.model); only
 	// the isolated query sets Model.
-	Model, Effort, Resume                 string
+	Model, Effort, Resume string
+	// ThinkingDisabled is the SDK's thinking:{type:"disabled"} (--thinking=disabled): PiG sends no
+	// reasoning level when thinking is off, and Claude Code would otherwise apply its own default.
+	ThinkingDisabled                      bool
 	MaxTurns                              int
 	StrictMcpConfig, NoSessionPersistence bool
 	IncludePartialMessages                bool
@@ -65,6 +101,9 @@ func sdkOption(key, value string) []string {
 // last as two-token pairs (extraArgs first, settings after). SDK MCP servers and the system prompt never appear on argv.
 func BuildArgs(o Options) []string {
 	args := []string{"--output-format", "stream-json", "--verbose", "--input-format", "stream-json"}
+	if o.ThinkingDisabled {
+		args = append(args, "--thinking=disabled")
+	}
 	if o.Effort != "" {
 		args = append(args, "--effort="+o.Effort)
 	}
@@ -127,13 +166,23 @@ func settingsJSON(settings map[string]any) string {
 }
 
 // BuildEnv returns the child environment: base plus o.Env, minus NODE_OPTIONS, DEBUG, TRACEPARENT and
-// TRACESTATE, with the SDK identity variables added when unset, then CCChildEnv,
-// CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 (index.ts sets it on process.env at load) and PI_CODING_AGENT=true.
+// TRACESTATE (and parentSessionVars when CLAUDECODE is set), with the SDK identity variables added when
+// unset, then CCChildEnv, CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 (the TypeScript sets it for the child
+// only since e93d51d; before, on process.env at load) and PI_CODING_AGENT=true.
 // Later entries win over earlier duplicates in the returned slice (execve semantics for the consumer).
 func BuildEnv(base []string, o Options) []string {
 	strip := map[string]bool{"NODE_OPTIONS": true, "DEBUG": true, "TRACEPARENT": true, "TRACESTATE": true}
-	env := make([]string, 0, len(base)+len(o.Env)+8)
-	for _, kv := range append(append([]string{}, base...), o.Env...) {
+	inherited := append(append([]string{}, base...), o.Env...)
+	if slices.ContainsFunc(inherited, func(kv string) bool {
+		k, v, _ := strings.Cut(kv, "=")
+		return k == "CLAUDECODE" && v != ""
+	}) {
+		for _, k := range parentSessionVars {
+			strip[k] = true
+		}
+	}
+	env := make([]string, 0, len(inherited)+8)
+	for _, kv := range inherited {
 		if !strip[strings.SplitN(kv, "=", 2)[0]] {
 			env = append(env, kv)
 		}

package/extensions/pig-claude-bridge/internal/ccproto/exec.go

@@ -4,6 +4,8 @@ package ccproto
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
 	"os/exec"
 	"path/filepath"
@@ -75,6 +77,31 @@ func Version(ctx context.Context, exe string) (string, error) {
 	return m[1], nil
 }
 
+// AuthStatusTimeout bounds `claude auth status`: it runs while the extension loads, which must not hang.
+var AuthStatusTimeout = 5 * time.Second
+
+// SubscriptionType runs `<exe> auth status --json` and returns its subscriptionType ("pro", "max",
+// "team", "enterprise"); "" when the login is not a Claude subscription.
+func SubscriptionType(ctx context.Context, exe string) (string, error) {
+	probe, cancel := context.WithTimeout(ctx, AuthStatusTimeout)
+	defer cancel()
+	name, args, err := commandLine(exe, "auth", "status", "--json")
+	if err != nil {
+		return "", err
+	}
+	cmd := exec.CommandContext(probe, name, args...)
+	cmd.WaitDelay = time.Second
+	// Logged out exits non-zero but still prints the JSON, so the output decides.
+	out, runErr := cmd.Output()
+	var status struct {
+		SubscriptionType string `json:"subscriptionType"`
+	}
+	if err := json.Unmarshal(out, &status); err != nil {
+		return "", fmt.Errorf("run %s auth status --json: %v (output %q)", exe, errors.Join(runErr, err), strings.TrimSpace(string(out)))
+	}
+	return status.SubscriptionType, nil
+}
+
 // OlderThan reports whether version is numerically older than minimum; unparsable input is not older.
 func OlderThan(version, minimum string) bool {
 	a, okA := parseSemver(version)

package/extensions/pig-claude-bridge/internal/config/config.go

@@ -43,8 +43,11 @@ type ProviderConfig struct {
 	StrictMcpConfig            *bool   `json:"strictMcpConfig,omitempty"`
 	AutoMemoryEnabled          *bool   `json:"autoMemoryEnabled,omitempty"`
 	PathToClaudeCodeExecutable *string `json:"pathToClaudeCodeExecutable,omitempty"`
-	// Plan is the subscription tier ("pro" | "max"). "max" enables Opus 4.6 at 1M context.
+	// Plan is the subscription tier ("pro" | "max" | "ultra" | "team" | "enterprise"). Every plan
+	// but "pro" enables Opus 4.6 at 1M context. Unset, the extension asks `claude auth status` at load.
 	Plan *string `json:"plan,omitempty"`
+	// FastMode starts every session with Claude Code's fast mode on; /claude-fast toggles it.
+	FastMode *bool `json:"fastMode,omitempty"`
 	// LongContextExtraUsage opts into metered 1M context usage. Enables Sonnet 4.6 [1m]
 	// on every plan and Opus 4.6 [1m] on Pro.
 	LongContextExtraUsage *bool `json:"longContextExtraUsage,omitempty"`

package/extensions/pig-claude-bridge/internal/models/models.go

@@ -18,7 +18,7 @@ const (
 
 // LongContextSettings carries the plan facts that decide whether a [1m] id is served.
 type LongContextSettings struct {
-	Plan                  string // "pro" or "max"
+	Plan                  string // "pro", "max", "ultra", "team" or "enterprise"
 	LongContextExtraUsage bool
 	// ForceTwoHundredK lists model ids whose declared 1M context Claude Code
 	// turned out not to serve; they stay on the bare id at 200K.
@@ -58,8 +58,11 @@ var measuredOneM = map[string]bool{
 // planGatedOneM holds the measured exceptions: pi-ai declares 1M and the [1m]
 // id works, but only when the plan allows it.
 var planGatedOneM = map[string]func(LongContextSettings) bool{
-	// [1m] measured 1M on Max plan / extra usage; 429 on Pro without it.
-	"claude-opus-4-6": func(s LongContextSettings) bool { return s.Plan == "max" || s.LongContextExtraUsage },
+	// [1m] measured 1M on Max plan / extra usage; 429 on Pro without it. Max, Ultra, Team (Standard
+	// and Premium) and Enterprise include it, per code.claude.com/docs/en/model-config#extended-context.
+	"claude-opus-4-6": func(s LongContextSettings) bool {
+		return slices.Contains([]string{"max", "ultra", "team", "enterprise"}, s.Plan) || s.LongContextExtraUsage
+	},
 	// [1m] measured 1M with extra usage only.
 	"claude-sonnet-4-6": func(s LongContextSettings) bool { return s.LongContextExtraUsage },
 }

package/package.json

@@ -1 +1 @@
-{"name":"pig-claude-bridge","version":"0.2.1","description":"Claude Code in PiG: Claude models as a provider and an AskClaude tool. A native Go port of pi-claude-bridge.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/balcsida/pig-claude-bridge.git"},"files":["extensions","!**/*_test.go","!**/testdata","docs/compatibility.md","UPSTREAM.md","THIRD_PARTY_NOTICES.md","SECURITY.md"],"keywords":["pig-package"],"pi":{"extensions":["extensions/pig-claude-bridge"]}}
+{"name":"pig-claude-bridge","version":"0.4.0","description":"Claude Code in PiG: Claude models as a provider and an AskClaude tool. A native Go port of pi-claude-bridge.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/balcsida/pig-claude-bridge.git"},"files":["extensions","!**/*_test.go","!**/testdata","docs/compatibility.md","UPSTREAM.md","THIRD_PARTY_NOTICES.md","SECURITY.md"],"keywords":["pig-package"],"pi":{"extensions":["extensions/pig-claude-bridge"]}}