@@ -59,8 +59,6 @@ reflect-sec105b.log
 *.test
 
 # Agent instructions: this repo is AGENTS.md-only.
-# `gitnexus analyze` regenerates a root CLAUDE.md that would shadow AGENTS.md
-# for tools that prefer it; keep the regenerated copy out of git.
 /CLAUDE.md
 
 # Local module overlay for building against a sibling checkout (e.g. relay).
 
@@ -198,51 +198,6 @@ and facade integration. Concentrate AI is a pay-as-you-go gateway implemented
 with its native Responses API (`/v1/responses`) under the
 `concentrate-payg` deployment.
 
-<!-- gitnexus:start -->
-## GitNexus — Code Intelligence
-
-This project is indexed by GitNexus as **reflect** (97743 symbols, 322940 relationships, 300 execution flows). Use the GitNexus MCP tools to understand code, assess impact, and navigate safely.
-
-> Index stale? Run `node .gitnexus/run.cjs analyze` from the project root — it auto-selects an available runner. No `.gitnexus/run.cjs` yet? `npx gitnexus analyze` (npm 11 crash → `npm i -g gitnexus`; #1939).
-
-## Always Do
-
-- **MUST run impact analysis before editing any symbol.** Before modifying a function, class, or method, run `impact({target: "symbolName", direction: "upstream"})` and report the blast radius (direct callers, affected processes, risk level) to the user.
-- **MUST run `detect_changes()` before committing** to verify your changes only affect expected symbols and execution flows. For regression review, compare against the default branch: `detect_changes({scope: "compare", base_ref: "main"})`.
-- **MUST warn the user** if impact analysis returns HIGH or CRITICAL risk before proceeding with edits.
-- When exploring unfamiliar code, use `query({search_query: "concept"})` to find execution flows instead of grepping. It returns process-grouped results ranked by relevance.
-- When you need full context on a specific symbol — callers, callees, which execution flows it participates in — use `context({name: "symbolName"})`.
-- For security review, `explain({target: "fileOrSymbol"})` lists taint findings (source→sink flows; needs `analyze --pdg`).
-
-## Never Do
-
-- NEVER edit a function, class, or method without first running `impact` on it.
-- NEVER ignore HIGH or CRITICAL risk warnings from impact analysis.
-- NEVER rename symbols with find-and-replace — use `rename` which understands the call graph.
-- NEVER commit changes without running `detect_changes()` to check affected scope.
-
-## Resources
-
-| Resource | Use for |
-|----------|---------|
-| `gitnexus://repo/reflect/context` | Codebase overview, check index freshness |
-| `gitnexus://repo/reflect/clusters` | All functional areas |
-| `gitnexus://repo/reflect/processes` | All execution flows |
-| `gitnexus://repo/reflect/process/{name}` | Step-by-step execution trace |
-
-## CLI
-
-| Task | Read this skill file |
-|------|---------------------|
-| Understand architecture / "How does X work?" | `.claude/skills/gitnexus/gitnexus-exploring/SKILL.md` |
-| Blast radius / "What breaks if I change X?" | `.claude/skills/gitnexus/gitnexus-impact-analysis/SKILL.md` |
-| Trace bugs / "Why is X failing?" | `.claude/skills/gitnexus/gitnexus-debugging/SKILL.md` |
-| Rename / extract / split / refactor | `.claude/skills/gitnexus/gitnexus-refactoring/SKILL.md` |
-| Tools, resources, schema reference | `.claude/skills/gitnexus/gitnexus-guide/SKILL.md` |
-| Index, status, clean, wiki CLI commands | `.claude/skills/gitnexus/gitnexus-cli/SKILL.md` |
-
-<!-- gitnexus:end -->
-
 ### Workspace workflow (sibling repos)
 
 reflect depends on ecosystem repos (`relay`, etc.) as independent sibling repos in the `graycode-eco` workspace. Reflect's `go.work` lists them as `../<repo>`, so local changes in any sibling are automatically picked up by reflect. Each sibling is its own git repo, versioned and released independently.
 
@@ -107,6 +107,39 @@ checklist: credentials → model → catalog → ecosystem.
 See [docs/SECURITY-DEVELOPER.md](docs/SECURITY-DEVELOPER.md) for the credential model.
 Do not put API keys in shell env or `.env` for reflect.
 
+### Build from a request
+
+Build the sibling CLIs once, then run the workflow against a clean Git repository:
+
+```bash
+(cd ../resolve && go build -o resolve ./cmd/resolve)
+(cd ../record && go build -o record ./cmd/record)
+(cd ../recall && go build -o recall ./cmd/recall)
+(cd ../rally && go build -o rally ./cmd/rally)
+(cd ../rivet && go build -o rivet ./cmd/rivet)
+./reflect work --request 'Build the requested feature' --repo /path/to/project \
+  --resolve-bin ../resolve/resolve --record-bin ../record/record \
+  --recall-bin ../recall/recall --rally-bin ../rally/rally \
+  --rivet-bin ../rivet/rivet --verify 'go test ./...'
+```
+
+`reflect work` creates a Resolve work item automatically, reads Recall context,
+creates a branch and worktree, and asks Reflect to implement the request through
+Relay. It verifies the resulting commit, creates a Record checkpoint, stores
+a sourced Recall outcome, and posts Rally updates. The item moves to
+`in_review`; the output prints the worktree, checkpoint, and memory IDs. You
+can also pass an existing Resolve ID instead of `--request`. Failed runs keep
+the worktree for inspection. Add `--pr` to push the verified branch to `origin` and
+open a draft GitHub PR through `gh`; without it, the work stays local.
+With `--rivet-bin`, verification keeps a full raw log outside the worktree and
+shows a compact result. Use `--verify-block NAME` instead of `--verify` to
+verify and run a Rivet block already committed in the target repository.
+
+The default `--auto semi` allows file edits but denies unattended shell tool
+calls. Use `--auto full` when the agent needs shell tools and you trust the
+ticket and repository. See [docs/WORKFLOW.md](docs/WORKFLOW.md) for the full
+local workflow and its current limits.
+
 Optional: install the current `main` with the Go toolchain. Historical
 higher-numbered hawk tags mean `@latest` cannot be relied on for the reset
 version series. Use `@main` or an explicit Reflect release tag.
 
@@ -541,7 +541,7 @@ func (m *chatModel) refreshInputPlaceholder() {
 }
 
 func (m chatModel) Init() tea.Cmd {
-	cmds := []tea.Cmd{initTerminalMouseCmd(m.mouseEnabled()), promptKeepAliveCmd(), eyeBlinkTickCmd()}
+	cmds := []tea.Cmd{initTerminalMouseCmd(m.mouseEnabled()), promptKeepAliveCmd()}
 	if m.mascotEnabled {
 		cmds = append(cmds, emitReflectMascotCmd())
 	}
 
@@ -76,7 +76,7 @@ func runPrint(text string) error {
 	var printed strings.Builder
 	var countdownShown bool
 	var lastUsage *engine.StreamUsage
-	turns := 0
+	turns := 1 // One print invocation is one user turn, even if usage arrives in parts.
 	started := time.Now()
 	for ev := range ch {
 		switch ev.Type {
@@ -114,8 +114,7 @@ func runPrint(text string) error {
 			}
 		case "usage":
 			if ev.Usage != nil {
-				lastUsage = ev.Usage
-				turns++
+				lastUsage = mergePrintUsage(lastUsage, ev.Usage)
 			}
 			if outputFormat == "stream-json" && ev.Usage != nil {
 				writePrintUsageEvent(sessionID, ev.Usage)
@@ -128,7 +127,7 @@ func runPrint(text string) error {
 		case "done":
 			switch outputFormat {
 			case "text":
-				printTextResponse(printed.String())
+				finishPrintTextResponse(printed.String())
 				printTextUsageFooter(lastUsage, started, turns, effectiveModel)
 			case "transcript":
 				printTranscript(sessionID, effectiveModel, printed.String(), lastUsage, started, turns)
@@ -148,7 +147,7 @@ func runPrint(text string) error {
 	}
 	switch outputFormat {
 	case "text":
-		printTextResponse(printed.String())
+		finishPrintTextResponse(printed.String())
 		printTextUsageFooter(lastUsage, started, turns, effectiveModel)
 	case "json":
 		writePrintResult(printed.String(), sessionID, sess, false, nil)
@@ -161,6 +160,40 @@ func runPrint(text string) error {
 	return nil
 }
 
+// Anthropic streams input and output usage in separate events. The footer and
+// transcript show the total for this invocation, not only the last event.
+func mergePrintUsage(total, next *engine.StreamUsage) *engine.StreamUsage {
+	if next == nil {
+		return total
+	}
+	if total == nil {
+		total = &engine.StreamUsage{}
+	}
+	total.PromptTokens += next.PromptTokens
+	total.CompletionTokens += next.CompletionTokens
+	total.CacheReadTokens += next.CacheReadTokens
+	total.CacheWriteTokens += next.CacheWriteTokens
+	if next.Provider != "" {
+		total.Provider = next.Provider
+	}
+	if next.Model != "" {
+		total.Model = next.Model
+	}
+	return total
+}
+
+// Plain text has already been streamed to stdout; only a trailing newline may
+// be needed. Markdown mode buffers content so it can be rendered once here.
+func finishPrintTextResponse(response string) {
+	if printMarkdown {
+		printTextResponse(response)
+		return
+	}
+	if !strings.HasSuffix(response, "\n") {
+		fmt.Println()
+	}
+}
+
 func writePrintUsageEvent(sessionID string, usage *engine.StreamUsage) {
 	usageEvent := map[string]int{
 		"prompt_tokens":     usage.PromptTokens,
 
@@ -119,3 +119,32 @@ func TestPrintTextUsageFooter(t *testing.T) {
 		}
 	})
 }
+
+func TestMergePrintUsageAcrossProviderEvents(t *testing.T) {
+	got := mergePrintUsage(nil, &engine.StreamUsage{PromptTokens: 11, CacheReadTokens: 90})
+	got = mergePrintUsage(got, &engine.StreamUsage{CompletionTokens: 42, CacheWriteTokens: 7})
+	if got.PromptTokens != 11 || got.CompletionTokens != 42 || got.CacheReadTokens != 90 || got.CacheWriteTokens != 7 {
+		t.Fatalf("partial provider usage was lost: %+v", got)
+	}
+}
+
+func TestFinishPrintTextResponseDoesNotRepeatStreamedContent(t *testing.T) {
+	oldMarkdown := printMarkdown
+	printMarkdown = false
+	defer func() { printMarkdown = oldMarkdown }()
+	oldStdout := os.Stdout
+	r, w, err := os.Pipe()
+	if err != nil {
+		t.Fatal(err)
+	}
+	os.Stdout = w
+	defer func() { os.Stdout = oldStdout }()
+	finishPrintTextResponse("Hello")
+	_ = w.Close()
+	buf := make([]byte, 64)
+	n, _ := r.Read(buf)
+	_ = r.Close()
+	if got := string(buf[:n]); got != "\n" {
+		t.Fatalf("completion repeated streamed text: %q", got)
+	}
+}
@@ -533,7 +533,7 @@ func (m chatModel) terminalView(content string) tea.View {
 // timeoutAt is non-zero, a visual countdown bar is shown above the options
 // so the user can see how long they have to decide before the prompt auto-dismisses.
 func renderPermissionBox(summary string, width int, timeoutAt time.Time) string {
-	title := lipgloss.NewStyle().Foreground(warnAmber).Bold(true).Render(icons.Alert() + " Permission required")
+	title := lipgloss.NewStyle().Foreground(warnAmber).Bold(true).Render("Permission request")
 	// Multi-line body: risk badge, action summary, short "why" (from FormatPermissionDisplay).
 	bodyWidth := width - 10
 	if bodyWidth < 20 {
@@ -552,13 +552,18 @@ func renderPermissionBox(summary string, width int, timeoutAt time.Time) string
 		}
 	}
 	body := lipgloss.JoinVertical(lipgloss.Left, bodyParts...)
-	options := lipgloss.NewStyle().Foreground(reflectColor).Render(strings.Join([]string{
-		"[y] allow once     [n] deny once",
-		"[s] allow this action for session",
-		"[d] deny this tool for session",
-		"[p] allow exact for project    [x] deny exact for project",
-	}, "\n"))
-	hint := lipgloss.NewStyle().Foreground(textMuted).Render("Session rules reset on exit · Project rules persist · Esc denies · 5m timeout")
+	primary := "[y] Allow once     [n] Deny"
+	secondary := "Remember this action: [s] Session  [p] Project\nBlock: [d] Tool for session  [x] Action for project"
+	if width < 60 {
+		primary = "[y] Allow once\n[n] Deny"
+		secondary = "Allow action: [s] Session  [p] Project\nBlock: [d] Tool/session  [x] Action/project"
+	}
+	options := lipgloss.JoinVertical(
+		lipgloss.Left,
+		lipgloss.NewStyle().Foreground(reflectColor).Bold(true).Render(primary),
+		lipgloss.NewStyle().Foreground(textMuted).Render(secondary),
+	)
+	hint := lipgloss.NewStyle().Foreground(textMuted).Render("Session rules end on exit · Project rules persist · Esc denies · 5m timeout")
 
 	return renderPromptCard(title, body, options, hint, warnAmber, width, timeoutAt)
 }
@@ -567,13 +572,13 @@ func renderPermissionBox(summary string, width int, timeoutAt time.Time) string
 // normal permission prompt, while making the extra high-risk checkpoint
 // visually distinct.
 func renderApprovalBox(summary string, width int, timeoutAt time.Time) string {
-	title := lipgloss.NewStyle().Foreground(errorCoral).Bold(true).Render(icons.Alert() + " High-risk approval required")
+	title := lipgloss.NewStyle().Foreground(errorCoral).Bold(true).Render("High-risk action")
 	body := renderPromptBody(summary, width)
-	options := lipgloss.NewStyle().Foreground(reflectColor).Render(strings.Join([]string{
-		"[y] approve once     [n] deny once",
-		"[s] approve category for session",
-		"[5] approve next 5 actions",
-	}, "\n"))
+	options := lipgloss.JoinVertical(
+		lipgloss.Left,
+		lipgloss.NewStyle().Foreground(reflectColor).Bold(true).Render("[y] Approve once     [n] Deny"),
+		lipgloss.NewStyle().Foreground(textMuted).Render("[s] Approve category for session\n[5] Approve next 5 actions"),
+	)
 	hint := lipgloss.NewStyle().Foreground(textMuted).Render("Esc denies · expires after 5 minutes")
 	return renderPromptCard(title, body, options, hint, errorCoral, width, timeoutAt)
 }
 
@@ -112,20 +112,9 @@ func buildWelcomeMessageWithSnapshotAndMascot(sess *engine.Session, sessionID st
 	if err != nil {
 		workspace = "."
 	}
-	details := []string{heading, ansiDim + selection + ansiReset, ansiDim + shortenHomePath(workspace) + ansiReset, ""}
-	mascot := reflectRobotArtLines()
-	if width-indent >= 50 {
-		for i, art := range mascot {
-			b.WriteString(line(ansiOrange + art + ansiReset + "  " + details[i]))
-		}
-	} else {
-		for _, art := range mascot {
-			b.WriteString(line(ansiOrange + art + ansiReset))
-		}
-		for _, detail := range details[:3] {
-			b.WriteString(line(detail))
-		}
-	}
+	b.WriteString(line(heading))
+	b.WriteString(line(ansiDim + shortenHomePath(workspace) + ansiReset))
+	b.WriteString(line(ansiDim + selection + ansiReset))
 	b.WriteString("\n")
 	if indicators := welcomeIndicatorRow(skillsCount, snapshot.agentsOK, mcpCount, ansiDim, ansiGrayDim, ansiReset, "", ""); indicators != "" {
 		b.WriteString(line(indicators))
 
@@ -11,17 +11,16 @@ import (
 func TestRenderPermissionBoxKeepsApprovalActionsReadable(t *testing.T) {
 	got := renderPermissionBox("Bash [HIGH risk]\nrun git status\nWhy: execute a command", 80, time.Now().Add(time.Minute))
 	for _, want := range []string{
-		"[y] allow once     [n] deny once",
-		"[s] allow this action for session",
-		"[d] deny this tool for session",
-		"[p] allow exact for project    [x] deny exact for project",
+		"[y] Allow once     [n] Deny",
+		"Remember this action: [s] Session  [p] Project",
+		"Block: [d] Tool for session  [x] Action for project",
 		"Esc denies",
 	} {
 		if !strings.Contains(got, want) {
 			t.Fatalf("permission card missing %q: %q", want, got)
 		}
 	}
-	if strings.Count(got, "allow once") != 1 {
+	if strings.Count(got, "Allow once") != 1 {
 		t.Fatalf("permission action should be rendered once: %q", got)
 	}
 }
@@ -40,9 +39,9 @@ func TestRenderPermissionBoxFitsNarrowTerminals(t *testing.T) {
 func TestRenderApprovalBoxKeepsKeyboardActionsReadable(t *testing.T) {
 	got := renderApprovalBox("network: curl https://example.com", 80, time.Now().Add(time.Minute))
 	for _, want := range []string{
-		"[y] approve once     [n] deny once",
-		"[s] approve category for session",
-		"[5] approve next 5 actions",
+		"[y] Approve once     [n] Deny",
+		"[s] Approve category for session",
+		"[5] Approve next 5 actions",
 		"Esc denies",
 	} {
 		if !strings.Contains(got, want) {
 
@@ -53,7 +53,7 @@ func (p promptInput) readLine(prompt string) (string, error) {
 
 func configureInteractivePrompts(sess *engine.Session, input promptInput) {
 	sess.PermSvc().SetPermissionFn(func(req safety.PermissionRequest) {
-		answer, err := input.readLine(fmt.Sprintf("\nAllow %s: %s [y/N, s=session, d=deny session, p=allow project, x=deny project] ", req.ToolName, req.Summary))
+		answer, err := input.readLine(formatInteractivePermissionPrompt(req))
 		if err != nil {
 			_, _ = fmt.Fprintf(os.Stderr, "\nAllow %s: %s (denied: %v)\n", req.ToolName, req.Summary, err)
 			resolvePermissionResponse(&req, false)
@@ -94,3 +94,7 @@ func configureInteractivePrompts(sess *engine.Session, input promptInput) {
 		return input.readLine(fmt.Sprintf("\n%s\n> ", question))
 	})
 }
+
+func formatInteractivePermissionPrompt(req safety.PermissionRequest) string {
+	return fmt.Sprintf("\nPermission request\n%s\n\n[y] Allow once  [n] Deny\n[s] Allow action for session  [p] Allow action for project\n[d] Block tool for session  [x] Block action for project\nChoice (default deny): ", safety.FormatPermissionDisplay(req.ToolName, req.Summary))
+}
Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ func (m *chatModel) refreshInputPlaceholder() {`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`func (m chatModel) Init() tea.Cmd {`
`544`		`- cmds := []tea.Cmd{initTerminalMouseCmd(m.mouseEnabled()), promptKeepAliveCmd(), eyeBlinkTickCmd()}`
	`544`	`+ cmds := []tea.Cmd{initTerminalMouseCmd(m.mouseEnabled()), promptKeepAliveCmd()}`
`545`	`545`	`if m.mascotEnabled {`
`546`	`546`	`cmds = append(cmds, emitReflectMascotCmd())`
`547`	`547`	`}`