mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-09-08 22:21:45 +00:00
Fabro
parent
5ee829a05c
commit
e51859a3e3
7 changed files with 499 additions and 14 deletions
341
run.json
341
run.json
File diff suppressed because one or more lines are too long
1
stages/008-verify@1/output.log
Normal file
1
stages/008-verify@1/output.log
Normal file
|
|
@ -0,0 +1 @@
|
|||
blob://sha256/0bfec1ab49b6f861df49b7e0cf32609e7ddb50921ca43aa94673e3de701742bf
|
||||
8
stages/008-verify@1/script_timing.json
Normal file
8
stages/008-verify@1/script_timing.json
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"output": "blob://sha256/0bfec1ab49b6f861df49b7e0cf32609e7ddb50921ca43aa94673e3de701742bf",
|
||||
"exit_code": 128,
|
||||
"duration_ms": 1740,
|
||||
"termination": "exited",
|
||||
"output_bytes": 502,
|
||||
"live_streaming": true
|
||||
}
|
||||
6
stages/008-verify@1/status.json
Normal file
6
stages/008-verify@1/status.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"outcome": "failed",
|
||||
"notes": null,
|
||||
"failure_reason": "Script failed with exit code: 128\n\n## output\nFrom https://github.com/fabro-sh/fabro\n * branch main -> FETCH_HEAD\n a64a58d56..caba862a3 main -> origin/main\nCommitter identity unknown\n\n*** Please tell me who you are.\n\nRun\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"Your Name\"\n\nto set your account's default identity.\nOmit --global to set the identity only in this repository.\n\nfatal: unable to auto-detect email address (got 'root@e2a149ab-1b61-4353-80c8-bfa6c242b88e.(none)')\n",
|
||||
"timestamp": "2026-05-23T17:43:42.661094Z"
|
||||
}
|
||||
136
stages/009-fixup@1/prompt.md
Normal file
136
stages/009-fixup@1/prompt.md
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
Goal: # Mid-Stage Agent Interview Tools
|
||||
|
||||
## Summary
|
||||
|
||||
Add model-native question tools that let agents pause mid-stage and ask the human for input through Fabro's existing interview system.
|
||||
|
||||
OpenAI-profile agents get `request_user_input`; Anthropic-profile agents get `AskUserQuestion`. When either tool is called, Fabro creates pending interview questions, surfaces them through the existing web/API/Slack paths, waits for answers, then returns provider-shaped tool results so the model can continue the same stage.
|
||||
|
||||
## Key Changes
|
||||
|
||||
- Extend the existing interview contract without type sprawl:
|
||||
- Add optional `description` and `preview` fields to the canonical `fabro_types::InterviewOption`; reuse that type through `fabro-api` replacements instead of introducing `AgentQuestionOption`, API-only aliases, or adapter-only duplicate types.
|
||||
- Update OpenAPI, generated Rust/TypeScript clients, event conversion, projection, Slack/web mappers, and the existing `with_replacement("InterviewOption", "fabro_types::InterviewOption", ...)` parity tests.
|
||||
- Treat both fields as untrusted model-authored display data. Store and expose them after enforcing bounded lengths; truncate or reject oversized values consistently before persistence.
|
||||
- Initial UI behavior: display `description` under option labels where practical. Capture and expose `preview`, but do not render preview content specially in web or Slack v1.
|
||||
|
||||
- Add a shared run-level interview runtime:
|
||||
- Move the private human-node blocked-state refcount into a reusable run-level guard used by both `HumanHandler` and agent question tools, so `RunUnblocked` is emitted only when all human and agent interviews for the run are resolved.
|
||||
- Runtime accepts the interviewer, workflow emitter, stage scope, stage id, tool call id, and normalized questions.
|
||||
- Support batch asks as a first-class operation: emit/register all questions first, mark the run blocked once, await all answers concurrently, then emit completion/timeout/interrupted events per question and unblock when the batch resolves.
|
||||
- Batch support applies only to multiple `questions[]` inside one question-tool call. Do not aggregate multiple separate question-tool calls from the same model round.
|
||||
- Generate safe internal question IDs with a ULID/UUID plus stage visit/tool-call context; store original model question IDs/text in question metadata for provider result mapping.
|
||||
|
||||
- Add provider-specific agent tools:
|
||||
- `request_user_input` for `AgentProfileKind::OpenAi`.
|
||||
- Accept Codex-compatible schema: `questions[]` with `id`, `header`, `question`, and `options[] { label, description }`.
|
||||
- Normalize each question to `QuestionType::MultipleChoice` with `allow_freeform: true`.
|
||||
- Return JSON text matching Codex shape, keyed by the original model question ID: `{"answers":{"id":{"answers":["..."]}}}`.
|
||||
- `AskUserQuestion` for `AgentProfileKind::Anthropic`.
|
||||
- Accept Claude-compatible schema: `questions[]` with `question`, `header`, `options[] { label, description, preview? }`, and `multiSelect`.
|
||||
- Normalize single-select to `MultipleChoice`, multi-select to `MultiSelect`, always with `allow_freeform: true`.
|
||||
- Return Claude-style tool result text keyed by the original question text: `User has answered your questions: "...question..."="answer". You can now continue...`.
|
||||
- Answer formatting for both tools returns user-facing option labels to the model. Preserve internal option keys for validation and event storage. For multi-select, preserve the submission order supplied by the answer path.
|
||||
|
||||
- Thread workflow interview context into agent tool execution:
|
||||
- Add an explicit per-turn agent tool runtime context passed into `process_input` or an adjacent `process_input_with_runtime` API. It carries the interviewer, workflow emitter, stage scope/id, shared block guard, and provider answer formatter.
|
||||
- Do not capture stage-specific interview handles in the profile registry or cached session construction; cached full-fidelity sessions must receive the current turn's stage context dynamically.
|
||||
- Child/subagent sessions must not expose these question tools. If somehow called outside the root session, return a model-visible error.
|
||||
- Question tools must execute alone in a model tool round. If a round contains one question tool plus any other tool call, execute the question tool and return model-visible error results for the non-question peers, preserving tool-call/tool-result ordering. If a round contains multiple separate question-tool calls, execute only the first and return model-visible error results for the later question-tool calls instructing the model to combine questions into one `questions[]` batch.
|
||||
- Agent-originated questions have no per-question timeout in v1 because the provider schemas do not include timeout. They rely on existing stage timeout, wall-clock timeout, cancellation, and interruption behavior.
|
||||
|
||||
- Preserve existing answer paths:
|
||||
- Do not add a new answer endpoint.
|
||||
- Continue using `GET /runs/{id}/questions` and `POST /runs/{id}/questions/{qid}/answer`.
|
||||
- Keep `ControlInterviewer`, web `InterviewDock`, Slack blocks, and run projection as the delivery mechanism.
|
||||
|
||||
## Test Plan
|
||||
|
||||
- Unit tests for schema parsing and normalization:
|
||||
- Codex request with descriptions maps to Fabro multiple-choice questions and returns answers by model question ID.
|
||||
- Claude request with `multiSelect: true` maps to `MultiSelect` and returns comma-separated answer text.
|
||||
- Batched Codex and Claude requests surface all questions as pending before awaiting answers, then return one result with every answer mapped to the original model ID/text.
|
||||
- Optional `preview` and `description` survive event, projection, API conversion, OpenAPI replacement tests, and TypeScript client generation.
|
||||
- Oversized `description`/`preview` values are bounded before persistence and never rendered as trusted HTML.
|
||||
|
||||
- Workflow and agent tests:
|
||||
- OpenAI-profile session advertises `request_user_input`; Anthropic-profile session advertises `AskUserQuestion`; Gemini advertises neither.
|
||||
- Subagent profiles do not advertise the question tools.
|
||||
- Root agent can ask a question and resume after the answer.
|
||||
- Subagent or missing interview context returns a clear tool error.
|
||||
- Cached full-fidelity session emits interview events against the current stage, not the original cached stage.
|
||||
- A mixed tool round containing a human-question tool plus another tool preserves all required tool results and rejects the peer calls with model-visible errors.
|
||||
- A round with multiple separate question-tool calls executes only the first and rejects later question-tool calls with model-visible errors.
|
||||
|
||||
- Server, projection, and UI tests:
|
||||
- `InterviewStarted` with option metadata appears in pending questions.
|
||||
- Submitting valid selected, multi-selected, and freeform answers unblocks the waiting tool.
|
||||
- Duplicate answer submission remains rejected through existing accepted-question logic.
|
||||
- Parallel human gate plus agent question keeps the run blocked until both are answered.
|
||||
- Pause, cancel, and interrupt while an agent question is waiting resolve pending questions consistently and do not leave the run blocked.
|
||||
- Stage timeout or wall-clock timeout while an agent question is waiting interrupts the batch; no per-question timeout event is expected unless a future schema adds timeout.
|
||||
- Slack answer submissions work for agent-originated questions using the same pending interview transport.
|
||||
|
||||
- Run checks:
|
||||
- `cargo nextest run -p fabro-interview -p fabro-workflow -p fabro-server -p fabro-agent`
|
||||
- `cd apps/fabro-web && bun test && bun run typecheck`
|
||||
- Regenerate and verify OpenAPI-derived Rust and TypeScript clients after schema changes.
|
||||
|
||||
## Assumptions
|
||||
|
||||
- This feature is only for in-process/API-backed agent sessions, not ACP external agents in v1.
|
||||
- `preview` is stored and exposed but not rendered specially in the first implementation.
|
||||
- Human-question tools are available only during root agent execution inside a workflow run with an active interviewer.
|
||||
- Existing interview events remain the source of truth for pending questions; no separate agent-question event family is added.
|
||||
- The implementation should prefer extending existing interview structs and replacement mappings over adding parallel API DTOs or conversion-only aliases.
|
||||
|
||||
|
||||
## Completed stages
|
||||
- **toolchain**: succeeded
|
||||
- Script: `command -v cargo >/dev/null || { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && sudo ln -sf $HOME/.cargo/bin/* /usr/local/bin/; }; cargo --version 2>&1`
|
||||
- Output:
|
||||
```
|
||||
cargo 1.95.0 (f2d3ce0bd 2026-03-21)
|
||||
```
|
||||
- **preflight_compile**: succeeded
|
||||
- Script: `cargo check -q --workspace 2>&1`
|
||||
- Output: (empty)
|
||||
- **preflight_lint**: succeeded
|
||||
- Script: `cargo +nightly-2026-04-14 clippy -q --workspace --all-targets -- -D warnings 2>&1`
|
||||
- Output: (empty)
|
||||
- **implement**: succeeded
|
||||
- Model: gpt-5.5, 483.3k tokens in / 63.1k out
|
||||
- Files: /home/daytona/workspace/fabro/lib/crates/fabro-agent/src/question_tools.rs, /home/daytona/workspace/fabro/lib/crates/fabro-workflow/src/interview_runtime.rs
|
||||
- **simplify_opus**: succeeded
|
||||
- Model: claude-opus-4-7, 112.5k tokens in / 28.7k out
|
||||
- Files: /home/daytona/workspace/fabro/lib/crates/fabro-agent/src/question_tools.rs, /home/daytona/workspace/fabro/lib/crates/fabro-agent/src/tool_execution.rs, /home/daytona/workspace/fabro/lib/crates/fabro-workflow/src/interview_runtime.rs
|
||||
- **simplify_gpt**: succeeded
|
||||
- Model: gpt-5.5, 83.6k tokens in / 7.7k out
|
||||
- **verify**: failed
|
||||
- Script: `git fetch origin main 2>&1 && git merge --no-edit --no-stat origin/main 2>&1 && cargo +nightly-2026-04-14 fmt --all 2>&1 && cargo dev docs refresh 2>&1 && cargo +nightly-2026-04-14 fmt --check --all 2>&1 && ! rg -n 'AuthMode::Disabled|RunAuthMethod|RunSubjectProvenance|\bActorRef\b|\bActorKind\b|AuthenticatedSubject|AuthenticatedService|AuthorizeRunScoped|AuthorizeRunBlob|AuthorizeStageArtifact|AuthorizeCommandLog|auth_method\s*==\s*"disabled"' lib/crates apps lib/packages docs/public/api-reference/fabro-api.yaml 2>&1 && cargo +nightly-2026-04-14 clippy --workspace --all-targets -- -D warnings 2>&1 && cargo nextest run --workspace --status-level slow --profile ci 2>&1 && cargo dev docs check 2>&1 && bun install --frozen-lockfile 2>&1 && (cd apps/fabro-web && bun run typecheck) 2>&1 && (cd apps/fabro-web && bun run test) 2>&1 && (cd lib/packages/fabro-api-client && bun run typecheck) 2>&1 && cargo dev build -- -p fabro-cli --release 2>&1`
|
||||
- Output:
|
||||
```
|
||||
From https://github.com/fabro-sh/fabro
|
||||
* branch main -> FETCH_HEAD
|
||||
a64a58d56..caba862a3 main -> origin/main
|
||||
Committer identity unknown
|
||||
|
||||
*** Please tell me who you are.
|
||||
|
||||
Run
|
||||
|
||||
git config --global user.email "you@example.com"
|
||||
git config --global user.name "Your Name"
|
||||
|
||||
to set your account's default identity.
|
||||
Omit --global to set the identity only in this repository.
|
||||
|
||||
fatal: unable to auto-detect email address (got 'root@e2a149ab-1b61-4353-80c8-bfa6c242b88e.(none)')
|
||||
```
|
||||
|
||||
## Context
|
||||
- failure_class: deterministic
|
||||
- failure_signature: verify|deterministic|script failed with exit code: <n> ## output from https://github.com/fabro-sh/fabro * branch main -> fetch_head <hex>..<hex> main -> origin/main committer identity unknown *** please tell me who you are. run git config --global user.email "y
|
||||
|
||||
|
||||
The verify step failed. Read the build output from context and fix all format, clippy, Rust test, docs, TypeScript typecheck/test, and build failures.
|
||||
5
stages/009-fixup@1/provider_used.json
Normal file
5
stages/009-fixup@1/provider_used.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"mode": "agent",
|
||||
"provider": "anthropic",
|
||||
"model": "claude-opus-4-7"
|
||||
}
|
||||
16
stages/009-fixup@1/response.md
Normal file
16
stages/009-fixup@1/response.md
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
All verify steps pass. The verify failure was due to an unset git identity preventing the merge, and the merge introduced two conflicts:
|
||||
|
||||
1. **`lib/crates/fabro-slack/src/blocks.rs`** — Resolved by keeping both new tests (the local `option_descriptions_are_rendered_and_preview_is_not_special_cased` test and the four new run-lifecycle tests from main).
|
||||
|
||||
2. **`lib/crates/fabro-workflow/src/handler/agent.rs`** — Resolved by adopting `main`'s new `emit_stage_prompt` helper while preserving the local `AgentToolRuntime` construction (with `WorkflowAgentQuestionRuntime`) needed for the agent question tools.
|
||||
|
||||
Verification results:
|
||||
- `cargo +nightly-2026-04-14 fmt --check --all`: clean
|
||||
- Forbidden-token grep: clean
|
||||
- `cargo +nightly-2026-04-14 clippy --workspace --all-targets -- -D warnings`: clean
|
||||
- `cargo nextest run --workspace --profile ci`: 6203 passed, 181 skipped
|
||||
- `cargo dev docs check`: up to date
|
||||
- `bun install --frozen-lockfile`: no changes
|
||||
- `apps/fabro-web` typecheck + test: 440 pass, 0 fail
|
||||
- `lib/packages/fabro-api-client` typecheck: clean
|
||||
- `cargo dev build -- -p fabro-cli --release`: success
|
||||
Loading…
Add table
Reference in a new issue