refactor with new API design (still working)

apps/web/content/docs/using-devo/plan-mode.mdx

@@ -77,9 +77,9 @@ After a `Proposed Plan` appears, Devo opens a small action menu.
 Choose `Implement Plan` when the plan is ready. Devo switches back to `BUILD`
 mode and submits an implementation turn using that plan.
 
-Choose `修改建议` when the plan needs changes. This is the current TUI label for
-the revise-plan action. It keeps the composer in `PLAN` mode and lets you type
-feedback such as:
+Choose `Revise Plan` when the plan needs changes. When that option is
+highlighted, type feedback directly in the menu and press Enter. Devo stays in
+`PLAN` mode and submits a revise turn with your feedback, for example:
 
 ```text
 Keep the config migration out of scope. Add a test for Windows paths.

apps/web/content/docs/using-devo/plan-mode.zh.mdx

@@ -63,7 +63,7 @@ Plan Mode turn 完成后，Devo 可以在 transcript 中渲染 `Proposed Plan` c
 
 选择 `Implement Plan` 表示计划可执行。Devo 切回 `BUILD` mode，并使用该计划提交实现 turn。
 
-选择 `修改建议` 表示计划需要修改。这是当前 TUI 对 revise-plan action 的标签。它会保持 composer 在 `PLAN` mode，并让你输入反馈，例如：
+选择 `Revise Plan` 表示计划需要修改。高亮该选项后，可直接在菜单中输入反馈并按 Enter。Devo 保持 `PLAN` mode，并用你的反馈提交 revise turn，例如：
 
 ```text
 Keep the config migration out of scope. Add a test for Windows paths.

crates/cli/src/prompt_command.rs

@@ -152,6 +152,7 @@ pub(crate) async fn run_prompt(
         registry,
         &runtime,
         jsonl_event_callback(output_format, session_id_for_events),
+        devo_core::QueryOptions::default(),
     )
     .await;
 

crates/client/src/acp_permissions.rs

@@ -218,6 +218,7 @@ fn acp_approval_request_notification(
                 turn_id: Some(pending.turn_id),
                 item_id: Some(pending.item_id),
                 seq: 0,
+                item_seq: None,
             },
             item: ItemEnvelope {
                 item_id: pending.item_id,
@@ -236,6 +237,7 @@ fn acp_approval_decision_notification(
         approval_id: params.approval_id.clone(),
         decision: acp_approval_decision_label(&params.decision).to_string(),
         scope: acp_approval_scope_label(&params.scope).to_string(),
+        decision_source: Some(devo_protocol::canonical::item::ApprovalDecisionSource::User),
     };
     acp_item_notification(
         "item/completed",
@@ -245,6 +247,7 @@ fn acp_approval_decision_notification(
                 turn_id: Some(pending.turn_id),
                 item_id: Some(pending.item_id),
                 seq: 0,
+                item_seq: None,
             },
             item: ItemEnvelope {
                 item_id: ItemId::new(),
@@ -491,6 +494,7 @@ mod tests {
                 turn_id: Some(turn_id),
                 item_id: Some(item_id),
                 seq: 0,
+                item_seq: None,
             }
         );
         assert_eq!(request_item.item.item_id, item_id);
@@ -559,6 +563,7 @@ mod tests {
                 turn_id: Some(turn_id),
                 item_id: Some(item_id),
                 seq: 0,
+                item_seq: None,
             }
         );
         assert_eq!(decision_item.item.item_kind, ItemKind::ApprovalDecision);
@@ -568,6 +573,7 @@ mod tests {
                 approval_id: request_payload.approval_id,
                 decision: "approve".to_string(),
                 scope: "once".to_string(),
+                decision_source: Some(devo_protocol::canonical::item::ApprovalDecisionSource::User,),
             }
         );
     }

crates/client/src/client_core.rs

@@ -459,6 +459,13 @@ impl ServerClientCore {
         self.request_devo("session/title/update", params).await
     }
 
+    pub(crate) async fn session_delete(
+        &mut self,
+        params: AcpDeleteSessionParams,
+    ) -> Result<AcpDeleteSessionResult> {
+        self.request(ACP_SESSION_DELETE_METHOD, params).await
+    }
+
     pub(crate) async fn session_metadata_update(
         &mut self,
         params: SessionMetadataUpdateParams,
@@ -949,6 +956,8 @@ fn format_protocol_error_code(code: &ProtocolErrorCode) -> &'static str {
         ProtocolErrorCode::ForkTurnNotFound => "fork_turn_not_found",
         ProtocolErrorCode::ForkTurnNotStable => "fork_turn_not_stable",
         ProtocolErrorCode::PermissionDenied => "permission_denied",
+        ProtocolErrorCode::CursorExpired => "cursor_expired",
+        ProtocolErrorCode::QueueItemNotFound => "queue_item_not_found",
         ProtocolErrorCode::WorkspaceUnavailable => "workspace_unavailable",
         ProtocolErrorCode::InheritedSegmentWriteFailed => "inherited_segment_write_failed",
         ProtocolErrorCode::ForkRetentionRequired => "fork_retention_required",
@@ -963,6 +972,9 @@ fn format_protocol_error_code(code: &ProtocolErrorCode) -> &'static str {
         ProtocolErrorCode::InvalidContentParts => "invalid_content_parts",
         ProtocolErrorCode::InvalidMentions => "invalid_mentions",
         ProtocolErrorCode::WorkspaceRestoreFailedToStart => "workspace_restore_failed_to_start",
+        ProtocolErrorCode::RestorePlanNotFound => "restore_plan_not_found",
+        ProtocolErrorCode::RestorePlanExpired => "restore_plan_expired",
+        ProtocolErrorCode::WorkspaceVersionConflict => "workspace_version_conflict",
         ProtocolErrorCode::InternalError => "internal_error",
     }
 }
@@ -1034,6 +1046,7 @@ fn acp_session_metadata_from_start_params(
         last_query_usage: None,
         last_query_total_tokens: 0,
         status: SessionRuntimeStatus::Idle,
+        collaboration_mode: Default::default(),
     }
 }
 
@@ -1071,6 +1084,7 @@ fn acp_session_metadata_from_session_info(session_info: &AcpSessionInfo) -> Sess
         last_query_usage: None,
         last_query_total_tokens: 0,
         status: SessionRuntimeStatus::Idle,
+        collaboration_mode: Default::default(),
     }
 }
 

crates/client/src/stdio.rs

@@ -171,6 +171,13 @@ impl StdioServerClient {
         self.core.session_title_update(params).await
     }
 
+    pub async fn session_delete(
+        &mut self,
+        params: AcpDeleteSessionParams,
+    ) -> Result<AcpDeleteSessionResult> {
+        self.core.session_delete(params).await
+    }
+
     pub async fn session_metadata_update(
         &mut self,
         params: SessionMetadataUpdateParams,
@@ -672,6 +679,7 @@ mod tests {
             last_query_usage: None,
             last_query_total_tokens: 0,
             status: SessionRuntimeStatus::Idle,
+            collaboration_mode: Default::default(),
         };
         assert_eq!(session, expected);
 
@@ -763,6 +771,7 @@ mod tests {
                 last_query_usage: None,
                 last_query_total_tokens: 0,
                 status: SessionRuntimeStatus::Idle,
+                collaboration_mode: Default::default(),
             }]
         );
 
@@ -812,6 +821,7 @@ mod tests {
             last_query_usage: None,
             last_query_total_tokens: 0,
             status: SessionRuntimeStatus::Idle,
+            collaboration_mode: Default::default(),
         };
         let mut stdout_lines = BufReader::new(stdout).lines();
 

crates/client/src/websocket.rs

@@ -146,6 +146,15 @@ impl WebSocketServerClient {
         self.core.request_devo("session/title/update", params).await
     }
 
+    pub async fn session_delete(
+        &mut self,
+        params: AcpDeleteSessionParams,
+    ) -> Result<AcpDeleteSessionResult> {
+        self.core
+            .request(devo_protocol::ACP_SESSION_DELETE_METHOD, params)
+            .await
+    }
+
     pub async fn session_metadata_update(
         &mut self,
         params: SessionMetadataUpdateParams,