lalph 0.3.38 → 0.3.39

package/dist/cli.mjs

@@ -197913,12 +197913,6 @@ var TaskTools = class extends make$8(make$6("listTasks", {
 		])
 	})),
 	dependencies: [CurrentProjectId]
-}), make$6("chooseTask", {
-	description: "Choose the task to work on",
-	parameters: Struct({
-		taskId: String$1,
-		githubPrNumber: optional$2(Number$1)
-	})
 }), make$6("createTask", {
 	description: "Create a new task and return it's id.",
 	parameters: Struct({
@@ -197941,11 +197935,14 @@ var TaskTools = class extends make$8(make$6("listTasks", {
 		blockedBy: optional$2(PrdIssue.fields.blockedBy)
 	}),
 	dependencies: [CurrentProjectId]
-}), make$6("removeTask", {
-	description: "Remove a task by it's id.",
-	parameters: String$1.annotate({ identifier: "taskId" }),
-	dependencies: [CurrentProjectId]
 })) {};
+var TaskToolsWithChoose = class extends merge$1(TaskTools, make$8(make$6("chooseTask", {
+	description: "Choose the task to work on",
+	parameters: Struct({
+		taskId: String$1,
+		githubPrNumber: optional$2(Number$1)
+	})
+}))) {};
 //#endregion
 //#region src/Clanka.ts
 const runClanka = fnUntraced(
@@ -197953,7 +197950,7 @@ const runClanka = fnUntraced(
 	function* (options) {
 		const agent = yield* make$4({
 			...options,
-			tools: TaskTools,
+			tools: options.withChoose ? TaskToolsWithChoose : TaskTools,
 			subagentModel: clankaSubagent
 		});
 		return yield* (options.stallTimeout ? withStallTimeout(options.stallTimeout)(agent.output) : agent.output).pipe(pretty, runForEachArray((out) => {
@@ -197962,9 +197959,9 @@ const runClanka = fnUntraced(
 		}), (_) => _);
 	},
 	scoped$1,
-	provide$1([layerServices, TaskTools.toLayer(gen(function* () {
+	provide$1([layerServices, TaskToolsWithChoose.toLayer(gen(function* () {
 		const source = yield* IssueSource;
-		return TaskTools.of({
+		return TaskToolsWithChoose.of({
 			listTasks: fn("TaskTools.listTasks")(function* () {
 				yield* log$1(`Calling "listTasks"`);
 				const projectId = yield* CurrentProjectId;
@@ -197999,11 +197996,6 @@ const runClanka = fnUntraced(
 					issueId: options.taskId,
 					...options
 				});
-			}, orDie$2),
-			removeTask: fn("TaskTools.removeTask")(function* (taskId) {
-				yield* log$1(`Calling "removeTask"`).pipe(annotateLogs({ taskId }));
-				const projectId = yield* CurrentProjectId;
-				yield* source.cancelIssue(projectId, taskId);
 			}, orDie$2)
 		});
 	}))])
@@ -198140,7 +198132,8 @@ const runWithClanka = fnUntraced(function* (options) {
 	const chooseResult = yield* runClanka({
 		directory: worktree.directory,
 		prompt: promptGen.promptChooseClanka({ gitFlow }),
-		stallTimeout: options.stallTimeout
+		stallTimeout: options.stallTimeout,
+		withChoose: true
 	}).pipe(andThen(fail$6(new ChosenTaskNotFound())), provideService$2(ChosenTaskDeferred, deferred), provide$1(model), raceFirst(_await(deferred)), withSpan("Main.choose"));
 	const chosenTask = yield* taskById(chooseResult.taskId);
 	if (!chosenTask) return yield* new ChosenTaskNotFound();
@@ -198556,7 +198549,7 @@ const commandEdit = make$45("edit").pipe(withDescription("Open the selected proj
 const commandSource = make$45("source").pipe(withDescription("Select the issue source to use (e.g. GitHub Issues or Linear). This applies to all projects."), withHandler(() => selectIssueSource), provide(Settings.layer));
 //#endregion
 //#region package.json
-var version = "0.3.38";
+var version = "0.3.39";
 //#endregion
 //#region src/commands/projects/ls.ts
 const commandProjectsLs = make$45("ls").pipe(withDescription("List configured projects and how they run (enabled state, concurrency, branch, git flow, review agent)."), withHandler(fnUntraced(function* () {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.38",
+  "version": "0.3.39",
   "publishConfig": {
     "access": "public"
   },

package/src/Clanka.ts

@@ -1,6 +1,10 @@
 import { Agent, OutputFormatter } from "clanka"
 import { Duration, Effect, Stream } from "effect"
-import { TaskTools, TaskToolsHandlers } from "./TaskTools.ts"
+import {
+  TaskTools,
+  TaskToolsHandlers,
+  TaskToolsWithChoose,
+} from "./TaskTools.ts"
 import { clankaSubagent } from "./ClankaModels.ts"
 import { withStallTimeout } from "./shared/stream.ts"
 import type { AiError } from "effect/unstable/ai"
@@ -13,10 +17,13 @@ export const runClanka = Effect.fnUntraced(
     readonly prompt: string
     readonly system?: string | undefined
     readonly stallTimeout?: Duration.Input | undefined
+    readonly withChoose?: boolean | undefined
   }) {
     const agent = yield* Agent.make({
       ...options,
-      tools: TaskTools,
+      tools: options.withChoose
+        ? TaskToolsWithChoose
+        : (TaskTools as unknown as typeof TaskToolsWithChoose),
       subagentModel: clankaSubagent,
     })
     let stream = options.stallTimeout

package/src/TaskTools.ts

@@ -34,13 +34,6 @@ export class TaskTools extends Toolkit.make(
     ),
     dependencies: [CurrentProjectId],
   }),
-  Tool.make("chooseTask", {
-    description: "Choose the task to work on",
-    parameters: Schema.Struct({
-      taskId: Schema.String,
-      githubPrNumber: Schema.optional(Schema.Number),
-    }),
-  }),
   Tool.make("createTask", {
     description: "Create a new task and return it's id.",
     parameters: Schema.Struct({
@@ -65,20 +58,33 @@ export class TaskTools extends Toolkit.make(
     }),
     dependencies: [CurrentProjectId],
   }),
-  Tool.make("removeTask", {
-    description: "Remove a task by it's id.",
-    parameters: Schema.String.annotate({
-      identifier: "taskId",
+  // Tool.make("removeTask", {
+  //   description: "Remove a task by it's id.",
+  //   parameters: Schema.String.annotate({
+  //     identifier: "taskId",
+  //   }),
+  //   dependencies: [CurrentProjectId],
+  // }),
+) {}
+
+export class TaskToolsWithChoose extends Toolkit.merge(
+  TaskTools,
+  Toolkit.make(
+    Tool.make("chooseTask", {
+      description: "Choose the task to work on",
+      parameters: Schema.Struct({
+        taskId: Schema.String,
+        githubPrNumber: Schema.optional(Schema.Number),
+      }),
     }),
-    dependencies: [CurrentProjectId],
-  }),
+  ),
 ) {}
 
-export const TaskToolsHandlers = TaskTools.toLayer(
+export const TaskToolsHandlers = TaskToolsWithChoose.toLayer(
   Effect.gen(function* () {
     const source = yield* IssueSource
 
-    return TaskTools.of({
+    return TaskToolsWithChoose.of({
       listTasks: Effect.fn("TaskTools.listTasks")(function* () {
         yield* Effect.log(`Calling "listTasks"`)
         const projectId = yield* CurrentProjectId
@@ -124,13 +130,13 @@ export const TaskToolsHandlers = TaskTools.toLayer(
           ...options,
         })
       }, Effect.orDie),
-      removeTask: Effect.fn("TaskTools.removeTask")(function* (taskId) {
-        yield* Effect.log(`Calling "removeTask"`).pipe(
-          Effect.annotateLogs({ taskId }),
-        )
-        const projectId = yield* CurrentProjectId
-        yield* source.cancelIssue(projectId, taskId)
-      }, Effect.orDie),
+      // removeTask: Effect.fn("TaskTools.removeTask")(function* (taskId) {
+      //   yield* Effect.log(`Calling "removeTask"`).pipe(
+      //     Effect.annotateLogs({ taskId }),
+      //   )
+      //   const projectId = yield* CurrentProjectId
+      //   yield* source.cancelIssue(projectId, taskId)
+      // }, Effect.orDie),
     })
   }),
 )

package/src/commands/root.ts

@@ -369,6 +369,7 @@ const runWithClanka = Effect.fnUntraced(
       directory: worktree.directory,
       prompt: promptGen.promptChooseClanka({ gitFlow }),
       stallTimeout: options.stallTimeout,
+      withChoose: true,
     }).pipe(
       Effect.andThen(Effect.fail(new ChosenTaskNotFound())),
       Effect.provideService(ChosenTaskDeferred, deferred),