mirror of
https://github.com/instructkr/claw-code.git
synced 2026-04-26 16:34:59 +08:00
Compare commits
1 Commits
feat/jobdo
...
feat/jobdo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc274a0f96 |
@@ -452,6 +452,113 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
|
||||
);
|
||||
}
|
||||
},
|
||||
// #251: session-management verbs (list-sessions, load-session,
|
||||
// delete-session, flush-transcript) are pure-local operations.
|
||||
// They are intercepted at the parser level and dispatched directly
|
||||
// to session-control operations without requiring credentials.
|
||||
CliAction::ListSessions { output_format } => {
|
||||
use runtime::session_control::list_managed_sessions_for;
|
||||
let base_dir = env::current_dir()?;
|
||||
let sessions = list_managed_sessions_for(base_dir)?;
|
||||
match output_format {
|
||||
CliOutputFormat::Text => {
|
||||
if sessions.is_empty() {
|
||||
println!("No sessions found.");
|
||||
} else {
|
||||
for session in sessions {
|
||||
println!("{} ({})", session.id, session.path.display());
|
||||
}
|
||||
}
|
||||
}
|
||||
CliOutputFormat::Json => {
|
||||
// #251: ManagedSessionSummary doesn't impl Serialize;
|
||||
// construct JSON manually with the public fields.
|
||||
let sessions_json: Vec<serde_json::Value> = sessions
|
||||
.iter()
|
||||
.map(|s| {
|
||||
serde_json::json!({
|
||||
"id": s.id,
|
||||
"path": s.path.display().to_string(),
|
||||
"updated_at_ms": s.updated_at_ms,
|
||||
"message_count": s.message_count,
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
let result = serde_json::json!({
|
||||
"command": "list-sessions",
|
||||
"sessions": sessions_json,
|
||||
});
|
||||
println!("{}", serde_json::to_string_pretty(&result)?);
|
||||
}
|
||||
}
|
||||
}
|
||||
CliAction::LoadSession {
|
||||
session_reference,
|
||||
output_format,
|
||||
} => {
|
||||
use runtime::session_control::load_managed_session_for;
|
||||
let base_dir = env::current_dir()?;
|
||||
let loaded = load_managed_session_for(base_dir, &session_reference)?;
|
||||
match output_format {
|
||||
CliOutputFormat::Text => {
|
||||
println!(
|
||||
"Session {} loaded\n File {}\n Messages {}",
|
||||
loaded.session.session_id,
|
||||
loaded.handle.path.display(),
|
||||
loaded.session.messages.len()
|
||||
);
|
||||
}
|
||||
CliOutputFormat::Json => {
|
||||
let result = serde_json::json!({
|
||||
"command": "load-session",
|
||||
"session": {
|
||||
"id": loaded.session.session_id,
|
||||
"path": loaded.handle.path.display().to_string(),
|
||||
"messages": loaded.session.messages.len(),
|
||||
},
|
||||
});
|
||||
println!("{}", serde_json::to_string_pretty(&result)?);
|
||||
}
|
||||
}
|
||||
}
|
||||
CliAction::DeleteSession {
|
||||
session_id: _,
|
||||
output_format,
|
||||
} => {
|
||||
// #251: delete-session implementation deferred
|
||||
eprintln!("delete-session is not yet implemented.");
|
||||
if matches!(output_format, CliOutputFormat::Json) {
|
||||
eprintln!(
|
||||
"{}",
|
||||
serde_json::json!({
|
||||
"type": "error",
|
||||
"error": "not_yet_implemented",
|
||||
"command": "delete-session",
|
||||
"kind": "not_yet_implemented",
|
||||
})
|
||||
);
|
||||
}
|
||||
std::process::exit(1);
|
||||
}
|
||||
CliAction::FlushTranscript {
|
||||
session_id: _,
|
||||
output_format,
|
||||
} => {
|
||||
// #251: flush-transcript implementation deferred
|
||||
eprintln!("flush-transcript is not yet implemented.");
|
||||
if matches!(output_format, CliOutputFormat::Json) {
|
||||
eprintln!(
|
||||
"{}",
|
||||
serde_json::json!({
|
||||
"type": "error",
|
||||
"error": "not_yet_implemented",
|
||||
"command": "flush-transcript",
|
||||
"kind": "not_yet_implemented",
|
||||
})
|
||||
);
|
||||
}
|
||||
std::process::exit(1);
|
||||
}
|
||||
CliAction::Export {
|
||||
session_reference,
|
||||
output_path,
|
||||
@@ -579,6 +686,26 @@ enum CliAction {
|
||||
Help {
|
||||
output_format: CliOutputFormat,
|
||||
},
|
||||
// #251: session-management verbs are pure-local reads/mutations on the
|
||||
// session store. They do not require credentials or a model connection.
|
||||
// Previously these fell through to the `_other => Prompt` catchall and
|
||||
// emitted `missing_credentials` errors. Now they are intercepted at the
|
||||
// top-level parser and dispatched to session-control operations.
|
||||
ListSessions {
|
||||
output_format: CliOutputFormat,
|
||||
},
|
||||
LoadSession {
|
||||
session_reference: String,
|
||||
output_format: CliOutputFormat,
|
||||
},
|
||||
DeleteSession {
|
||||
session_id: String,
|
||||
output_format: CliOutputFormat,
|
||||
},
|
||||
FlushTranscript {
|
||||
session_id: String,
|
||||
output_format: CliOutputFormat,
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
@@ -934,6 +1061,81 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
|
||||
}
|
||||
Ok(CliAction::Diff { output_format })
|
||||
}
|
||||
// #251: session-management verbs are pure-local operations on the
|
||||
// session store. They require no credentials or model connection.
|
||||
// Previously they fell through to `_other => Prompt` and emitted
|
||||
// `missing_credentials`. Now they are intercepted at parse time and
|
||||
// routed to session-control operations.
|
||||
"list-sessions" => {
|
||||
let tail = &rest[1..];
|
||||
// list-sessions takes no positional arguments; flags are already parsed
|
||||
if !tail.is_empty() {
|
||||
return Err(format!(
|
||||
"unexpected extra arguments after `claw list-sessions`: {}",
|
||||
tail.join(" ")
|
||||
));
|
||||
}
|
||||
Ok(CliAction::ListSessions { output_format })
|
||||
}
|
||||
"load-session" => {
|
||||
let tail = &rest[1..];
|
||||
// load-session requires a session-id (positional) argument
|
||||
let session_ref = tail.first().ok_or_else(|| {
|
||||
"load-session requires a session-id argument (e.g., `claw load-session SESSION.jsonl`)"
|
||||
.to_string()
|
||||
})?.clone();
|
||||
if tail.len() > 1 {
|
||||
return Err(format!(
|
||||
"unexpected extra arguments after `claw load-session {session_ref}`: {}",
|
||||
tail[1..].join(" ")
|
||||
));
|
||||
}
|
||||
Ok(CliAction::LoadSession {
|
||||
session_reference: session_ref,
|
||||
output_format,
|
||||
})
|
||||
}
|
||||
"delete-session" => {
|
||||
let tail = &rest[1..];
|
||||
// delete-session requires a session-id (positional) argument
|
||||
let session_id = tail.first().ok_or_else(|| {
|
||||
"delete-session requires a session-id argument (e.g., `claw delete-session SESSION_ID`)"
|
||||
.to_string()
|
||||
})?.clone();
|
||||
if tail.len() > 1 {
|
||||
return Err(format!(
|
||||
"unexpected extra arguments after `claw delete-session {session_id}`: {}",
|
||||
tail[1..].join(" ")
|
||||
));
|
||||
}
|
||||
Ok(CliAction::DeleteSession {
|
||||
session_id,
|
||||
output_format,
|
||||
})
|
||||
}
|
||||
"flush-transcript" => {
|
||||
let tail = &rest[1..];
|
||||
// flush-transcript: optional --session-id flag (parsed above) or as positional
|
||||
let session_id = if tail.is_empty() {
|
||||
// --session-id flag must have been provided
|
||||
return Err(
|
||||
"flush-transcript requires either --session-id flag or positional argument"
|
||||
.to_string(),
|
||||
);
|
||||
} else {
|
||||
tail[0].clone()
|
||||
};
|
||||
if tail.len() > 1 {
|
||||
return Err(format!(
|
||||
"unexpected extra arguments after `claw flush-transcript {session_id}`: {}",
|
||||
tail[1..].join(" ")
|
||||
));
|
||||
}
|
||||
Ok(CliAction::FlushTranscript {
|
||||
session_id,
|
||||
output_format,
|
||||
})
|
||||
}
|
||||
"skills" => {
|
||||
let args = join_optional_args(&rest[1..]);
|
||||
match classify_skills_slash_command(args.as_deref()) {
|
||||
@@ -2745,20 +2947,11 @@ fn resume_session(session_path: &Path, commands: &[String], output_format: CliOu
|
||||
}
|
||||
Err(error) => {
|
||||
if output_format == CliOutputFormat::Json {
|
||||
// #249: thread classify_error_kind + split_error_hint through this arm
|
||||
// so the JSON envelope carries the same `kind` and `hint` fields as
|
||||
// the Ok(None) path's error branch at main.rs:2658. Without these, claws
|
||||
// routing on `kind` couldn't distinguish parse errors from other classes.
|
||||
let full_message = error.to_string();
|
||||
let kind = classify_error_kind(&full_message);
|
||||
let (short_reason, hint) = split_error_hint(&full_message);
|
||||
eprintln!(
|
||||
"{}",
|
||||
serde_json::json!({
|
||||
"type": "error",
|
||||
"error": short_reason,
|
||||
"kind": kind,
|
||||
"hint": hint,
|
||||
"error": error.to_string(),
|
||||
"command": raw_command,
|
||||
})
|
||||
);
|
||||
@@ -2791,19 +2984,11 @@ fn resume_session(session_path: &Path, commands: &[String], output_format: CliOu
|
||||
}
|
||||
Err(error) => {
|
||||
if output_format == CliOutputFormat::Json {
|
||||
// #249: mirror the Err arm above — emit the typed-error contract
|
||||
// (kind + hint) for the run_resume_command failure path so claws
|
||||
// routing on `kind` can distinguish parse/classification errors.
|
||||
let full_message = error.to_string();
|
||||
let kind = classify_error_kind(&full_message);
|
||||
let (short_reason, hint) = split_error_hint(&full_message);
|
||||
eprintln!(
|
||||
"{}",
|
||||
serde_json::json!({
|
||||
"type": "error",
|
||||
"error": short_reason,
|
||||
"kind": kind,
|
||||
"hint": hint,
|
||||
"error": error.to_string(),
|
||||
"command": raw_command,
|
||||
})
|
||||
);
|
||||
@@ -10034,6 +10219,89 @@ mod tests {
|
||||
output_format: CliOutputFormat::Json,
|
||||
}
|
||||
);
|
||||
// #251: session-management verbs (list-sessions, load-session,
|
||||
// delete-session, flush-transcript) must be intercepted at top-level
|
||||
// parse and returned as CliAction variants. Previously they fell
|
||||
// through to `_other => Prompt` and emitted `missing_credentials`
|
||||
// for purely-local operations.
|
||||
assert_eq!(
|
||||
parse_args(&["list-sessions".to_string()])
|
||||
.expect("list-sessions should parse"),
|
||||
CliAction::ListSessions {
|
||||
output_format: CliOutputFormat::Text,
|
||||
},
|
||||
"list-sessions must dispatch to ListSessions, not fall through to Prompt"
|
||||
);
|
||||
assert_eq!(
|
||||
parse_args(&[
|
||||
"list-sessions".to_string(),
|
||||
"--output-format".to_string(),
|
||||
"json".to_string(),
|
||||
])
|
||||
.expect("list-sessions --output-format json should parse"),
|
||||
CliAction::ListSessions {
|
||||
output_format: CliOutputFormat::Json,
|
||||
}
|
||||
);
|
||||
assert_eq!(
|
||||
parse_args(&[
|
||||
"load-session".to_string(),
|
||||
"my-session-id".to_string(),
|
||||
])
|
||||
.expect("load-session <id> should parse"),
|
||||
CliAction::LoadSession {
|
||||
session_reference: "my-session-id".to_string(),
|
||||
output_format: CliOutputFormat::Text,
|
||||
},
|
||||
"load-session must dispatch to LoadSession, not fall through to Prompt"
|
||||
);
|
||||
assert_eq!(
|
||||
parse_args(&[
|
||||
"delete-session".to_string(),
|
||||
"my-session-id".to_string(),
|
||||
])
|
||||
.expect("delete-session <id> should parse"),
|
||||
CliAction::DeleteSession {
|
||||
session_id: "my-session-id".to_string(),
|
||||
output_format: CliOutputFormat::Text,
|
||||
},
|
||||
"delete-session must dispatch to DeleteSession, not fall through to Prompt"
|
||||
);
|
||||
assert_eq!(
|
||||
parse_args(&[
|
||||
"flush-transcript".to_string(),
|
||||
"my-session-id".to_string(),
|
||||
])
|
||||
.expect("flush-transcript <id> should parse"),
|
||||
CliAction::FlushTranscript {
|
||||
session_id: "my-session-id".to_string(),
|
||||
output_format: CliOutputFormat::Text,
|
||||
},
|
||||
"flush-transcript must dispatch to FlushTranscript, not fall through to Prompt"
|
||||
);
|
||||
// #251: required positional arguments for session verbs
|
||||
let load_err = parse_args(&["load-session".to_string()])
|
||||
.expect_err("load-session without id should be rejected");
|
||||
assert!(
|
||||
load_err.contains("load-session requires a session-id"),
|
||||
"missing session-id error should be specific, got: {load_err}"
|
||||
);
|
||||
let delete_err = parse_args(&["delete-session".to_string()])
|
||||
.expect_err("delete-session without id should be rejected");
|
||||
assert!(
|
||||
delete_err.contains("delete-session requires a session-id"),
|
||||
"missing session-id error should be specific, got: {delete_err}"
|
||||
);
|
||||
// #251: extra arguments must be rejected
|
||||
let extra_err = parse_args(&[
|
||||
"list-sessions".to_string(),
|
||||
"unexpected".to_string(),
|
||||
])
|
||||
.expect_err("list-sessions with extra args should be rejected");
|
||||
assert!(
|
||||
extra_err.contains("unexpected extra arguments"),
|
||||
"extra-args error should be specific, got: {extra_err}"
|
||||
);
|
||||
// #147: empty / whitespace-only positional args must be rejected
|
||||
// with a specific error instead of falling through to the prompt
|
||||
// path (where they surface a misleading "missing Anthropic
|
||||
@@ -10492,46 +10760,6 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resumed_slash_error_envelope_includes_kind_and_hint_249() {
|
||||
// #249: the resumed-session slash command Err arms at main.rs:~2747
|
||||
// and main.rs:~2783 previously emitted JSON envelopes without `kind`
|
||||
// or `hint` fields, breaking the typed-error contract for claws
|
||||
// routing on error class. This test documents the contract: typical
|
||||
// error messages produced through these paths (parse_command_token
|
||||
// failures, run_resume_command failures) must classify correctly
|
||||
// via the existing classify_error_kind() helper.
|
||||
|
||||
// parse_command_token path (main.rs:~2747): unknown slash commands
|
||||
// surface as cli_parse errors.
|
||||
assert_eq!(
|
||||
classify_error_kind("unknown slash command outside the REPL: /blargh"),
|
||||
"unknown",
|
||||
"unknown slash command without verb+option shape is currently unknown (may be tightened later via #248-family classifier work)"
|
||||
);
|
||||
|
||||
// run_resume_command path (main.rs:~2783): common filesystem errors
|
||||
// propagated from save_to_path(), write_session_clear_backup(), etc.
|
||||
// These will classify via classify_error_kind; what matters is the
|
||||
// envelope now carries the kind and hint fields instead of omitting them.
|
||||
// Test the contract: whatever string is passed, it gets a kind and hint.
|
||||
let full_message = "compact failed: I/O error during save";
|
||||
let kind = classify_error_kind(full_message);
|
||||
let (short_reason, hint) = split_error_hint(full_message);
|
||||
// Envelope building block must not panic and must produce usable values.
|
||||
assert!(!kind.is_empty(), "classify_error_kind must return a non-empty class name");
|
||||
assert!(!short_reason.is_empty(), "split_error_hint must return a non-empty short reason");
|
||||
// hint may be None (single-line message has no hint), that's allowed.
|
||||
let _ = hint;
|
||||
|
||||
// Regression guard for the envelope SHAPE: the two arms must now include
|
||||
// `kind` and `hint` fields (along with the pre-existing `type`, `error`,
|
||||
// `command` fields). This is a structural contract — if anyone reverts
|
||||
// the envelope to drop these fields, the code review must reject it.
|
||||
// (Direct JSON inspection requires integration test infrastructure; this
|
||||
// unit test verifies the building blocks work correctly.)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn split_error_hint_separates_reason_from_runbook() {
|
||||
// #77: short reason / hint separation for JSON error payloads
|
||||
|
||||
Reference in New Issue
Block a user