f485608108
- error_wire: StructuredError wrapper preserves ErrorV1 through anyhow → classify pipeline. Adds downcast short-circuit so cursor::decode's typed code = "stale_cursor" reaches the wire instead of being string-formatted to code = "generic". - app: search_with_opts now wraps cursor::decode error in StructuredError instead of anyhow! string format. - test: error_wire pins both negative (bare anyhow → not stale_cursor) AND positive (StructuredError → stale_cursor) invariants. CLI integration test runs end-to-end and asserts error.v1.code on stderr. - app: next_cursor only emitted on full-page (k-pop) path; drop speculative emit on snippet-only truncation that would point at a different page than the agent expected. - cursor: differentiate malformed-base64 / malformed-payload / revision-mismatch error messages; all keep code = stale_cursor. - test: cursor_rejected fixture uses .expect() to fail loud on cursor non-emission instead of silent skip. - test: max_tokens=0 → 1-hit floor + truncated=true. - docs: SKILL.md + schema description distinguish snippet-shrink (widen) vs k-pop (paginate) truncated cases. HOTFIXES notes --no-cache semantic shift (cached path + clear vs uncached path). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
76 lines
2.8 KiB
Rust
76 lines
2.8 KiB
Rust
//! p9-fb-34 opaque pagination cursor.
|
|
//!
|
|
//! Format: base64(JSON({offset: usize, corpus_revision: string})).
|
|
//! Opaque to callers — they MUST NOT decode the contents themselves;
|
|
//! the schema is internal and may change without notice.
|
|
|
|
use base64::Engine;
|
|
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
|
|
use crate::error_wire::ErrorV1;
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
struct Payload {
|
|
offset: usize,
|
|
corpus_revision: String,
|
|
}
|
|
|
|
/// Encode `(offset, corpus_revision)` as an opaque base64 string.
|
|
pub fn encode(offset: usize, corpus_revision: &str) -> String {
|
|
let payload = Payload {
|
|
offset,
|
|
corpus_revision: corpus_revision.to_string(),
|
|
};
|
|
let json = serde_json::to_vec(&payload).expect("Payload serializes");
|
|
URL_SAFE_NO_PAD.encode(&json)
|
|
}
|
|
|
|
/// Decode an opaque cursor against the expected `corpus_revision`.
|
|
/// Mismatch or malformed input returns an `ErrorV1` with
|
|
/// `code = "stale_cursor"`.
|
|
//
|
|
// p9-fb-34: ErrorV1 is the workspace-wide wire error struct (~200B
|
|
// after monomorphization with Value + String fields). Boxing here
|
|
// would force every call site to deref through a Box for no win —
|
|
// the err-path is rare. Single allow at the function level.
|
|
//
|
|
// p9-fb-34 round-1 review: differentiate the three failure modes
|
|
// (base64 / JSON / revision mismatch) with distinct messages — all
|
|
// keep `code = "stale_cursor"` so the agent's branching logic stays
|
|
// the same, but humans reading the message get a precise hint.
|
|
#[allow(clippy::result_large_err)]
|
|
pub fn decode(s: &str, expected_revision: &str) -> Result<usize, ErrorV1> {
|
|
let bytes = URL_SAFE_NO_PAD.decode(s.as_bytes()).map_err(|_| ErrorV1 {
|
|
schema_version: "error.v1".to_string(),
|
|
code: "stale_cursor".to_string(),
|
|
message: "cursor is not valid base64. Re-issue search to obtain a fresh cursor."
|
|
.to_string(),
|
|
details: Value::Null,
|
|
hint: None,
|
|
})?;
|
|
let payload: Payload = serde_json::from_slice(&bytes).map_err(|_| ErrorV1 {
|
|
schema_version: "error.v1".to_string(),
|
|
code: "stale_cursor".to_string(),
|
|
message: "cursor payload is malformed. Re-issue search to obtain a fresh cursor."
|
|
.to_string(),
|
|
details: Value::Null,
|
|
hint: None,
|
|
})?;
|
|
if payload.corpus_revision != expected_revision {
|
|
return Err(ErrorV1 {
|
|
schema_version: "error.v1".to_string(),
|
|
code: "stale_cursor".to_string(),
|
|
message: format!(
|
|
"cursor was issued against corpus_revision '{}'; current revision is \
|
|
'{}'. Re-issue search to obtain a fresh cursor.",
|
|
payload.corpus_revision, expected_revision
|
|
),
|
|
details: Value::Null,
|
|
hint: None,
|
|
});
|
|
}
|
|
Ok(payload.offset)
|
|
}
|