eeymoo/claw-code
1
0
Fork 0
mirror of https://github.com/instructkr/claw-code.git synced 2026-04-05 23:54:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflicts in lib.rs re-exports

Browse Source
This commit is contained in:
Jobdori
2026-04-04 00:48:26 +09:00
parent a1aba3c64a
commit 6d35399a12
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rust/crates/runtime/src/lib.rs
View File

@@ -17,7 +17,6 @@ pub mod mcp_tool_bridge;
mod oauth; mod oauth;
pub mod permission_enforcer; pub mod permission_enforcer;
mod policy_engine; mod policy_engine;
||||||| f76311f
pub mod recovery_recipes; pub mod recovery_recipes;
mod permissions; mod permissions;
pub mod plugin_lifecycle; pub mod plugin_lifecycle;
@@ -28,7 +27,6 @@ pub mod sandbox;
mod session; mod session;
mod sse; mod sse;
pub mod stale_branch; pub mod stale_branch;
||||||| f76311f
pub mod summary_compression; pub mod summary_compression;
pub mod task_registry; pub mod task_registry;
pub mod task_packet; pub mod task_packet;
@@ -104,7 +102,6 @@ pub use plugin_lifecycle::{
DegradedMode, DiscoveryResult, PluginHealthcheck, PluginLifecycle, PluginLifecycleEvent, DegradedMode, DiscoveryResult, PluginHealthcheck, PluginLifecycle, PluginLifecycleEvent,
PluginState, ResourceInfo, ServerHealth, ServerStatus, ToolInfo, PluginState, ResourceInfo, ServerHealth, ServerStatus, ToolInfo,
}; };
||||||| f76311f
pub use recovery_recipes::{ pub use recovery_recipes::{
attempt_recovery, recipe_for, EscalationPolicy, FailureScenario, RecoveryContext, attempt_recovery, recipe_for, EscalationPolicy, FailureScenario, RecoveryContext,
RecoveryEvent, RecoveryRecipe, RecoveryResult, RecoveryStep, RecoveryEvent, RecoveryRecipe, RecoveryResult, RecoveryStep,
@@ -134,20 +131,14 @@ pub use stale_branch::{
}; };
pub use sse::{IncrementalSseParser, SseEvent}; pub use sse::{IncrementalSseParser, SseEvent};
pub use task_packet::{ pub use task_packet::{
validate_packet, AcceptanceTest, BranchPolicy, CommitPolicy, EscalationPolicy, GreenLevel, validate_packet, AcceptanceTest, BranchPolicy, CommitPolicy,
RepoConfig, ReportingContract, TaskPacket, TaskPacketValidationError, TaskScope, RepoConfig, ReportingContract, TaskPacket, TaskPacketValidationError, TaskScope,
ValidatedPacket, ValidatedPacket,
}; };
||||||| f76311f
pub use usage::{ pub use usage::{
format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker, format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker,
}; };
||||||| f76311f
pub use trust_resolver::{TrustConfig, TrustDecision, TrustEvent, TrustPolicy, TrustResolver}; pub use trust_resolver::{TrustConfig, TrustDecision, TrustEvent, TrustPolicy, TrustResolver};
||||||| f76311f
pub use usage::{
format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker,
};
pub use worker_boot::{ pub use worker_boot::{
Worker, WorkerEvent, WorkerEventKind, WorkerFailure, WorkerFailureKind, WorkerReadySnapshot, Worker, WorkerEvent, WorkerEventKind, WorkerFailure, WorkerFailureKind, WorkerReadySnapshot,
WorkerRegistry, WorkerStatus, WorkerRegistry, WorkerStatus,