Skip to content

Commit a32bf06

Browse files
n0mahdclaude
andcommitted
fix(server): refuse a skill change in a folder that is gone instead of dying
The manager looked up the project with `orDie`, so a folder that no longer exists (which can't be normalized) was a defect instead of the `projectNotRegistered` refusal every other unknown folder gets. The manager now asks the catalog, which holds the rule for what a project is: a missing folder is refused, and only a failure of the lookup itself is a defect. The placement's `refuse` helper that only built its error is gone, per the service conventions. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
1 parent bd022a0 commit a32bf06

3 files changed

Lines changed: 65 additions & 21 deletions

File tree

‎apps/server/src/skills/SkillCatalog.test.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ import {
1313
} from "@t3tools/contracts";
1414
import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";
1515
import { symlinksSupported } from "@t3tools/shared/testing/symlinks";
16+
import * as Cause from "effect/Cause";
1617
import * as Effect from "effect/Effect";
18+
import * as Exit from "effect/Exit";
1719
import * as FileSystem from "effect/FileSystem";
1820
import * as Layer from "effect/Layer";
1921
import * as Option from "effect/Option";
2022
import * as Path from "effect/Path";
2123
import * as Schema from "effect/Schema";
2224

2325
import * as ProjectService from "../project/ProjectService.ts";
26+
import { ProjectOperationError } from "../project/ProjectService.ts";
2427
import * as Settings from "../serverSettings.ts";
2528
import * as SkillCatalog from "./SkillCatalog.ts";
2629

@@ -717,6 +720,47 @@ it.layer(NodeServices.layer, { excludeTestServices: true })("SkillCatalog", (it)
717720
});
718721

719722
describe("project folders", () => {
723+
it.effect(
724+
"refuses a folder that is gone as not a project, and dies on a failure of the lookup itself",
725+
() =>
726+
Effect.gen(function* () {
727+
const { home } = yield* makeMachine;
728+
const projects = Layer.mock(ProjectService.ProjectService)({
729+
getByWorkspaceRoot: (root) =>
730+
Effect.fail(
731+
new ProjectOperationError({
732+
operation: root.endsWith("/gone") ? "normalize-workspace" : "list-projects",
733+
workspaceRoot: root,
734+
cause: "stand-in",
735+
}),
736+
),
737+
});
738+
const onMachine = <A, E>(
739+
use: (catalog: SkillCatalog.SkillCatalog["Service"]) => Effect.Effect<A, E>,
740+
) =>
741+
Effect.gen(function* () {
742+
return yield* use(yield* SkillCatalog.SkillCatalog);
743+
}).pipe(
744+
Effect.provide(
745+
SkillCatalog.layer.pipe(
746+
Layer.provide(Layer.mergeAll(projects, Settings.layerTest({}))),
747+
),
748+
),
749+
Effect.provideService(HostProcessEnvironment, { HOME: home }),
750+
);
751+
752+
const gone = yield* onMachine((catalog) =>
753+
catalog.list({ cwd: `${home}/gone` }).pipe(Effect.flip),
754+
);
755+
expect(gone).toEqual(new SkillRequestError({ reason: "projectNotRegistered" }));
756+
757+
const failed = yield* onMachine((catalog) =>
758+
catalog.list({ cwd: `${home}/there` }).pipe(Effect.exit),
759+
);
760+
expect(Exit.isFailure(failed) && Cause.hasDies(failed.cause)).toBe(true);
761+
}),
762+
);
763+
720764
it.effect.skipIf(!symlinksSupported)(
721765
"reads a project's skill folders only when the folder is a registered project",
722766
() =>

‎apps/server/src/skills/SkillManager.ts‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -291,15 +291,11 @@ const make = Effect.gen(function* () {
291291
FileSystem.FileSystem | Path.Path | VcsProcess.VcsProcess
292292
>();
293293

294-
/** Links are only written under a folder the environment knows as a project. */
295-
const requireProject = (cwd: string) =>
296-
projects.getByWorkspaceRoot(cwd).pipe(
297-
Effect.orDie,
298-
Effect.filterOrFail(
299-
Option.isSome,
300-
() => new SkillRequestError({ reason: "projectNotRegistered" }),
301-
),
302-
);
294+
/**
295+
* Links are only written under a folder the environment knows as a project. The catalog says
296+
* which: it refuses any other folder, one that is gone included, before it reads anything.
297+
*/
298+
const requireProject = (cwd: string) => catalog.resolve({ cwd, skills: [] }).pipe(Effect.asVoid);
303299

304300
const removeAll = Effect.fnUntraced(function* (
305301
entries: ReadonlyArray<{ readonly path: string; readonly target: string }>,
@@ -671,7 +667,6 @@ const make = Effect.gen(function* () {
671667
}) =>
672668
writeLock.withPermits(1)(
673669
Effect.gen(function* () {
674-
if (input.cwd !== undefined) yield* requireProject(input.cwd);
675670
const before = yield* catalog.resolve({
676671
cwd: input.cwd,
677672
skills: [...input.skills, ...(input.alsoLookUp ?? [])],
@@ -782,7 +777,7 @@ const make = Effect.gen(function* () {
782777
// Codex, if its setting has to follow a moved folder, stays open for the whole request.
783778
const writers = makeWriters(yield* Scope.Scope);
784779
const { to } = input;
785-
if (input.cwd !== undefined) yield* requireProject(input.cwd);
780+
// The skills' own folder is checked when they are looked up.
786781
if (to.kind === "project") yield* requireProject(to.cwd);
787782
if (to.kind === "projects") for (const cwd of to.cwds) yield* requireProject(cwd);
788783
return yield* run({

‎apps/server/src/skills/SkillPlacement.ts‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ class SkillPlacementRefused extends Schema.TaggedError<SkillPlacementRefused>()(
8080

8181
const isRefused = Schema.is(SkillPlacementRefused);
8282

83-
const refuse = (reason: SkillOutcomeReason) => new SkillPlacementRefused({ reason });
84-
8583
const skipped = (reason: SkillOutcomeReason): PlacementChange => ({
8684
wrote: false,
8785
blocked: [],
@@ -260,7 +258,9 @@ export const makeSkillPlacement = Effect.fnUntraced(function* (deps: PlacementDe
260258
if (result === "created") made.push(link);
261259
else if (result === "taken" || result === "notAllowed") {
262260
if (folder === STANDARD_SKILL_FOLDER) {
263-
return yield* refuse(result === "taken" ? "destinationTaken" : "linkNotAllowed");
261+
return yield* new SkillPlacementRefused({
262+
reason: result === "taken" ? "destinationTaken" : "linkNotAllowed",
263+
});
264264
}
265265
for (const instanceId of input.agentsOf(folder)) {
266266
blocked.push({
@@ -538,8 +538,9 @@ export const makeSkillPlacement = Effect.fnUntraced(function* (deps: PlacementDe
538538
const moved = yield* inContext(
539539
moveFolder({ from: skill.home, to: entry, platform: deps.platform }),
540540
);
541-
if (moved === "taken") return yield* refuse("destinationTaken");
542-
if (moved === "inUse") return yield* refuse("inUse");
541+
if (moved === "taken")
542+
return yield* new SkillPlacementRefused({ reason: "destinationTaken" });
543+
if (moved === "inUse") return yield* new SkillPlacementRefused({ reason: "inUse" });
543544
journal.add(inContext(moveFolder({ from: entry, to: skill.home, platform: deps.platform })));
544545
if (moved === "movedWithLeftover") reason = "failed";
545546
} else {
@@ -549,7 +550,8 @@ export const makeSkillPlacement = Effect.fnUntraced(function* (deps: PlacementDe
549550
{ link: entry, target: skill.home, home: skill.home },
550551
"global",
551552
);
552-
if (made !== "created") return yield* refuse("destinationTaken");
553+
if (made !== "created")
554+
return yield* new SkillPlacementRefused({ reason: "destinationTaken" });
553555
}
554556

555557
// The links that led to the old place go before new ones are made: a new link may need the
@@ -701,8 +703,9 @@ export const makeSkillPlacement = Effect.fnUntraced(function* (deps: PlacementDe
701703
const moved = yield* inContext(
702704
moveFolder({ from: skill.library.entry, to: destination, platform: deps.platform }),
703705
);
704-
if (moved === "taken") return yield* refuse("destinationTaken");
705-
if (moved === "inUse") return yield* refuse("inUse");
706+
if (moved === "taken")
707+
return yield* new SkillPlacementRefused({ reason: "destinationTaken" });
708+
if (moved === "inUse") return yield* new SkillPlacementRefused({ reason: "inUse" });
706709
journal.add(
707710
inContext(
708711
moveFolder({ from: destination, to: skill.library.entry, platform: deps.platform }),
@@ -715,11 +718,13 @@ export const makeSkillPlacement = Effect.fnUntraced(function* (deps: PlacementDe
715718
{ link: destination, target: skill.home, home: skill.home },
716719
dest.scope,
717720
);
718-
if (made !== "created") return yield* refuse("destinationTaken");
721+
if (made !== "created")
722+
return yield* new SkillPlacementRefused({ reason: "destinationTaken" });
719723
const removed = yield* unlink(journal, [
720724
{ path: skill.library.entry, target: skill.library.target ?? skill.home },
721725
]);
722-
if (removed.get(skill.library.entry) === "failed") return yield* refuse("failed");
726+
if (removed.get(skill.library.entry) === "failed")
727+
return yield* new SkillPlacementRefused({ reason: "failed" });
723728
}
724729

725730
const real = yield* realPath(destination);

0 commit comments

Comments
 (0)