Skip to content

Commit 3b60c4d

Browse files
authored
Merge pull request #387 from TrueNine/dev
fix: CI compilation errors and Tauri version mismatch
2 parents 89cf11e + 0cafa8a commit 3b60c4d

9 files changed

Lines changed: 9729 additions & 13 deletions

File tree

pnpm-lock.yaml

Lines changed: 9717 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ catalog:
1616
"@tanstack/react-router": ^1.168.22
1717
"@tanstack/router-generator": ^1.166.32
1818
"@tanstack/router-plugin": ^1.167.22
19-
"@tauri-apps/api": ^2.10.1
20-
"@tauri-apps/cli": ^2.10.1
21-
"@tauri-apps/plugin-shell": ^2.3.5
22-
"@tauri-apps/plugin-updater": ^2.10.1
19+
"@tauri-apps/api": ~2.10.1
20+
"@tauri-apps/cli": ~2.10.1
21+
"@tauri-apps/plugin-shell": ~2.3.5
22+
"@tauri-apps/plugin-updater": ~2.10.1
2323
"@theguild/remark-mermaid": ^0.3.0
2424
"@truenine/eslint10-config": ^2026.10411.10025
2525
"@types/estree": ^1.0.8

sdk/src/domain/output_plans/codex_output_plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use std::path::PathBuf;
2020
use crate::CliError;
2121
use crate::domain::base_output_plans::{BaseOutputFileDeclarationDto, BaseOutputPluginPlanDto};
2222
use crate::domain::cleanup::{CleanupDeclarationsDto, CleanupTargetDto, CleanupTargetKindDto};
23-
use crate::domain::config;
2423
use crate::domain::output_context::OutputContext;
24+
use crate::domain::output_plans::shared::resolve_effective_home_dir;
2525
use crate::domain::plugin_shared::{Project, RelativePath, Workspace};
2626

2727
const CODEX_PLUGIN_NAME: &str = "CodexCLIOutputAdaptor";

sdk/src/domain/output_plans/droid_output_plan.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ use serde_json::{Map, Value};
66

77
use crate::CliError;
88
use crate::domain::cleanup::{CleanupDeclarationsDto, CleanupTargetDto, CleanupTargetKindDto};
9-
use crate::domain::config;
109
use crate::domain::output_context::OutputContext;
10+
use crate::domain::output_plans::shared::resolve_effective_home_dir;
1111
use crate::domain::plugin_shared::{
12-
FastCommandPrompt, Project, RelativePath, RuleScope, SkillPrompt, SkillResourceEncoding,
13-
Workspace,
12+
Project, RelativePath, RuleScope, SkillPrompt, SlashCommandPrompt, Workspace,
1413
};
1514

1615
const DROID_PLUGIN_NAME: &str = "DroidCLIOutputAdaptor";

sdk/src/domain/output_plans/gemini_output_plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use std::path::PathBuf;
44
use crate::CliError;
55
use crate::domain::base_output_plans::{BaseOutputFileDeclarationDto, BaseOutputPluginPlanDto};
66
use crate::domain::cleanup::{CleanupDeclarationsDto, CleanupTargetDto, CleanupTargetKindDto};
7-
use crate::domain::config;
87
use crate::domain::output_context::OutputContext;
8+
use crate::domain::output_plans::shared::resolve_effective_home_dir;
99
use crate::domain::plugin_shared::{Project, RelativePath, Workspace};
1010

1111
const GEMINI_PLUGIN_NAME: &str = "GeminiCLIOutputAdaptor";

sdk/src/domain/output_plans/opencode_output_plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use serde_json::Value;
55
use crate::CliError;
66
use crate::domain::base_output_plans::{BaseOutputFileDeclarationDto, BaseOutputPluginPlanDto};
77
use crate::domain::cleanup::{CleanupDeclarationsDto, CleanupTargetDto, CleanupTargetKindDto};
8-
use crate::domain::config;
98
use crate::domain::output_context::OutputContext;
9+
use crate::domain::output_plans::shared::resolve_effective_home_dir;
1010
use crate::domain::plugin_shared::{Project, RelativePath, Workspace};
1111

1212
const OPENCODE_PLUGIN_NAME: &str = "OpencodeCLIOutputAdaptor";

sdk/src/infra/logger/sink.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn clear_diagnostics() {
6868

6969
/// Bound the worker-drain wait so a wedged worker (deadlocked, sigstop'd,
7070
/// blocked on a slow stdout pipe) can't hang process shutdown indefinitely.
71-
const FLUSH_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(5);
71+
const _FLUSH_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(5);
7272

7373
pub fn flush() {
7474
let (ack_tx, ack_rx) = mpsc::channel();

sdk/src/services/dry_run_service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub fn dry_run(options: MemorySyncCommandOptions) -> Result<MemorySyncCommandRes
7979
"Context collected",
8080
Some(json!({
8181
"globalMemory": context.global_memory.is_some(),
82-
"commands": context.fast_commands.as_ref().map(|v| v.len()),
82+
"commands": context.slash_commands.as_ref().map(|v| v.len()),
8383
"skills": context.skills.as_ref().map(|v| v.len()),
8484
"rules": context.rules.as_ref().map(|v| v.len()),
8585
})),

sdk/src/services/install_service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub(crate) fn install(
9191
"Context collected",
9292
Some(json!({
9393
"globalMemory": context.global_memory.is_some(),
94-
"commands": context.fast_commands.as_ref().map(|v| v.len()),
94+
"commands": context.slash_commands.as_ref().map(|v| v.len()),
9595
"skills": context.skills.as_ref().map(|v| v.len()),
9696
"rules": context.rules.as_ref().map(|v| v.len()),
9797
})),

0 commit comments

Comments
 (0)