mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-10-09 03:20:56 +00:00
parent
3b4eee96ed
commit
667287f70d
5 changed files with 446 additions and 116 deletions
492
run.json
492
run.json
File diff suppressed because one or more lines are too long
45
stages/007-simplify_gpt@1/diff.patch
Normal file
45
stages/007-simplify_gpt@1/diff.patch
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
diff --git a/lib/crates/fabro-cli/src/commands/install.rs b/lib/crates/fabro-cli/src/commands/install.rs
|
||||
index 2f21e6fb9..9d0f635f5 100644
|
||||
--- a/lib/crates/fabro-cli/src/commands/install.rs
|
||||
+++ b/lib/crates/fabro-cli/src/commands/install.rs
|
||||
@@ -72,7 +72,6 @@ use crate::{local_server, server_client, user_config};
|
||||
|
||||
const GITHUB_TOKEN_SECRET_KEY: &str = fabro_static::EnvVars::GITHUB_TOKEN;
|
||||
const GITHUB_APP_PRIVATE_KEY_KEY: &str = fabro_static::EnvVars::GITHUB_APP_PRIVATE_KEY;
|
||||
-#[cfg(test)]
|
||||
const GITHUB_APP_CLIENT_SECRET_KEY: &str = fabro_static::EnvVars::GITHUB_APP_CLIENT_SECRET;
|
||||
const GITHUB_APP_WEBHOOK_SECRET_KEY: &str = fabro_static::EnvVars::GITHUB_APP_WEBHOOK_SECRET;
|
||||
|
||||
@@ -1163,11 +1162,11 @@ async fn setup_github_app(
|
||||
let pem_b64 = BASE64_STANDARD.encode(pem.as_bytes());
|
||||
|
||||
let mut env_pairs = vec![
|
||||
- ("GITHUB_APP_PRIVATE_KEY".to_string(), pem_b64),
|
||||
- ("GITHUB_APP_CLIENT_SECRET".to_string(), client_secret),
|
||||
+ (GITHUB_APP_PRIVATE_KEY_KEY.to_string(), pem_b64),
|
||||
+ (GITHUB_APP_CLIENT_SECRET_KEY.to_string(), client_secret),
|
||||
];
|
||||
if let Some(secret) = webhook_secret {
|
||||
- env_pairs.push(("GITHUB_APP_WEBHOOK_SECRET".to_string(), secret));
|
||||
+ env_pairs.push((GITHUB_APP_WEBHOOK_SECRET_KEY.to_string(), secret));
|
||||
}
|
||||
|
||||
Ok(GitHubAppRegistration {
|
||||
diff --git a/lib/crates/fabro-server/src/server.rs b/lib/crates/fabro-server/src/server.rs
|
||||
index 7ae486624..0c6c602d0 100644
|
||||
--- a/lib/crates/fabro-server/src/server.rs
|
||||
+++ b/lib/crates/fabro-server/src/server.rs
|
||||
@@ -2098,10 +2098,10 @@ pub(crate) fn build_app_state(config: AppStateConfig) -> anyhow::Result<Arc<AppS
|
||||
.map_err(anyhow::Error::from)
|
||||
})
|
||||
.transpose()?;
|
||||
+ let vault_guard = vault.try_read().ok();
|
||||
match resolve_slack_credentials_status_with_lookup(|name| {
|
||||
- vault
|
||||
- .try_read()
|
||||
- .ok()
|
||||
+ vault_guard
|
||||
+ .as_ref()
|
||||
.and_then(|vault| vault.get(name).map(str::to_string))
|
||||
}) {
|
||||
SlackCredentialResolution::Configured(credentials) => {
|
||||
14
stages/007-simplify_gpt@1/response.md
Normal file
14
stages/007-simplify_gpt@1/response.md
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
Reviewed the changes with three parallel subagents for reuse, quality, and efficiency.
|
||||
|
||||
Fixed two small cleanup issues:
|
||||
|
||||
- Replaced raw GitHub App secret-name strings in `lib/crates/fabro-cli/src/commands/install.rs` with existing constants.
|
||||
- Avoided repeated vault lock acquisition during Slack credential resolution in `lib/crates/fabro-server/src/server.rs` by taking one read guard and reusing it.
|
||||
|
||||
Validation run:
|
||||
|
||||
- `cargo +nightly-2026-04-14 fmt --check --all` ✅
|
||||
- `cargo nextest run -p fabro-server slack` ✅
|
||||
- `cargo nextest run -p fabro-cli install` ✅
|
||||
|
||||
Working tree now has only those two cleanup modifications.
|
||||
6
stages/007-simplify_gpt@1/status.json
Normal file
6
stages/007-simplify_gpt@1/status.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"outcome": "succeeded",
|
||||
"notes": "Stage completed: simplify_gpt",
|
||||
"failure_reason": null,
|
||||
"timestamp": "2026-05-25T18:47:32.170368Z"
|
||||
}
|
||||
5
stages/008-verify@1/script_invocation.json
Normal file
5
stages/008-verify@1/script_invocation.json
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"script": "git fetch origin main 2>&1 && git merge --no-edit --no-stat origin/main 2>&1 && cargo +nightly-2026-04-14 fmt --all 2>&1 && cargo dev docs refresh 2>&1 && cargo +nightly-2026-04-14 fmt --check --all 2>&1 && { command -v rg >/dev/null 2>&1 || { echo 'rg is required for verify'; exit 127; }; } && ! rg -n 'AuthMode::Disabled|RunAuthMethod|RunSubjectProvenance|\\bActorRef\\b|\\bActorKind\\b|AuthenticatedSubject|AuthenticatedService|AuthorizeRunScoped|AuthorizeRunBlob|AuthorizeStageArtifact|AuthorizeCommandLog|auth_method\\s*==\\s*\"disabled\"' lib/crates apps lib/packages docs/public/api-reference/fabro-api.yaml 2>&1 && cargo +nightly-2026-04-14 clippy --workspace --all-targets -- -D warnings 2>&1 && cargo nextest run --workspace --status-level slow --profile ci 2>&1 && cargo dev docs check 2>&1 && bun install --frozen-lockfile 2>&1 && (cd apps/fabro-web && bun run typecheck) 2>&1 && (cd apps/fabro-web && bun run test) 2>&1 && (cd lib/packages/fabro-api-client && bun run typecheck) 2>&1 && cargo dev build -- -p fabro-cli --release 2>&1",
|
||||
"command": "exec 2>&1\ngit fetch origin main 2>&1 && git merge --no-edit --no-stat origin/main 2>&1 && cargo +nightly-2026-04-14 fmt --all 2>&1 && cargo dev docs refresh 2>&1 && cargo +nightly-2026-04-14 fmt --check --all 2>&1 && { command -v rg >/dev/null 2>&1 || { echo 'rg is required for verify'; exit 127; }; } && ! rg -n 'AuthMode::Disabled|RunAuthMethod|RunSubjectProvenance|\\bActorRef\\b|\\bActorKind\\b|AuthenticatedSubject|AuthenticatedService|AuthorizeRunScoped|AuthorizeRunBlob|AuthorizeStageArtifact|AuthorizeCommandLog|auth_method\\s*==\\s*\"disabled\"' lib/crates apps lib/packages docs/public/api-reference/fabro-api.yaml 2>&1 && cargo +nightly-2026-04-14 clippy --workspace --all-targets -- -D warnings 2>&1 && cargo nextest run --workspace --status-level slow --profile ci 2>&1 && cargo dev docs check 2>&1 && bun install --frozen-lockfile 2>&1 && (cd apps/fabro-web && bun run typecheck) 2>&1 && (cd apps/fabro-web && bun run test) 2>&1 && (cd lib/packages/fabro-api-client && bun run typecheck) 2>&1 && cargo dev build -- -p fabro-cli --release 2>&1",
|
||||
"language": "shell"
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue