@pleaseai/work 0.1.4 → 0.1.6

package/README.md

@@ -165,6 +165,7 @@ agent:
 
 claude:
   permission_mode: acceptEdits
+  # setting_sources: []               # default: [project, local, user]; set [] for SDK isolation mode
   turn_timeout_ms: 3600000
 ---
 
@@ -224,6 +225,7 @@ agent:
 
 claude:
   permission_mode: acceptEdits
+  # setting_sources: []               # default: [project, local, user]; set [] for SDK isolation mode
   turn_timeout_ms: 3600000
 ---
 
@@ -287,6 +289,7 @@ agent:
 
 claude:
   permission_mode: acceptEdits
+  # setting_sources: []               # default: [project, local, user]; set [] for SDK isolation mode
   turn_timeout_ms: 3600000
 ---
 
@@ -394,9 +397,18 @@ claude:
     - Read
     - Write
     - Bash
+  setting_sources:                    # Optional: filesystem settings to load. Default: [project, local, user]
+    - project                         # load .claude/settings.json + CLAUDE.md from the workspace directory
+    - local                           # load .claude/settings.local.json from the workspace directory
+    - user                            # load ~/.claude/settings.json + global CLAUDE.md
+                                      # Only "project", "local", and "user" are valid — other values are ignored
   turn_timeout_ms: 3600000            # Optional: per-turn timeout in ms, default 3600000
   read_timeout_ms: 5000               # Optional: initial subprocess read timeout in ms, default 5000
   stall_timeout_ms: 300000            # Optional: stall detection timeout, default 300000
+  settings:
+    attribution:
+      commit: "🙏 Generated with [Work Please](https://github.com/pleaseai/work-please)"  # Optional: appended to git commit messages. Defaults to Work Please link.
+      pr: "🙏 Generated with [Work Please](https://github.com/pleaseai/work-please)"      # Optional: appended to PR descriptions. Defaults to Work Please link.
 
 server:
   port: 3000                          # Optional: enable HTTP dashboard on this port
@@ -410,9 +422,10 @@ Your prompt template goes here. Available variables:
 - {{ issue.description }}  — Issue body/description
 - {{ issue.state }}        — Current tracker state name
 - {{ issue.url }}          — Issue URL
-- {{ issue.assignee }}     — Primary assignee login (GitHub) or email (Asana), or null if unassigned
+- {{ issue.assignees }}     — Array of assignee logins (GitHub) or emails (Asana)
 - {{ issue.labels }}       — Array of label strings (normalized to lowercase)
 - {{ issue.blocked_by }}   — Array of blocker refs (each has id, identifier, state)
+- {{ issue.pull_requests }} — Array of linked PRs (each has number, title, url, state, branch_name)
 - {{ issue.priority }}     — Numeric priority or null
 - {{ issue.created_at }}   — ISO-8601 creation timestamp
 - {{ issue.updated_at }}   — ISO-8601 last-updated timestamp
@@ -437,6 +450,14 @@ Blocked by:
 {% endfor %}
 {% endif %}
 
+{% if issue.pull_requests.size > 0 %}
+Linked pull requests:
+{% for pr in issue.pull_requests %}
+- PR #{{ pr.number }}: {{ pr.title }} ({{ pr.state }}){% if pr.branch_name %} — branch: {{ pr.branch_name }}{% endif %}{% if pr.url %} — {{ pr.url }}{% endif %}
+
+{% endfor %}
+{% endif %}
+
 {% if attempt %}
 Retry attempt: {{ attempt }}
 {% endif %}

package/dist/index.js

@@ -2166,7 +2166,7 @@ var {
 var package_default = {
   name: "@pleaseai/work",
   type: "module",
-  version: "0.1.4",
+  version: "0.1.6",
   description: "Symphony-spec orchestrator for Claude Code + Asana/GitHub Projects v2",
   license: "FSL-1.1-MIT",
   repository: {
@@ -3088,6 +3088,13 @@ agent:
   max_turns: 20
 claude:
   permission_mode: bypassPermissions
+# claude.settings controls the attribution text written into .claude/settings.local.json
+# of each workspace. Omit to use the default Work Please attribution.
+# claude:
+#   settings:
+#     attribution:
+#       commit: "\uD83D\uDE4F Generated with Work Please"
+#       pr: "\uD83D\uDE4F Generated with Work Please"
 # server:
 #   port: 3000
 ---
@@ -31679,7 +31686,11 @@ function createToolsMcpServer(config2) {
 }
 
 // src/agent-runner.ts
+var UUID_PATTERN = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/i;
+var NEWLINE_PATTERN = /[\r\n]/g;
+
 class AppServerClient {
+  assignedSessionId = null;
   sessionId = null;
   abortController = null;
   workspace;
@@ -31690,11 +31701,20 @@ class AppServerClient {
     this.workspace = workspace;
     this.queryFn = queryFn;
   }
-  async startSession() {
+  async startSession(sessionId) {
+    this.assignedSessionId = null;
+    this.sessionId = null;
+    if (sessionId !== undefined && !UUID_PATTERN.test(sessionId)) {
+      const preview = String(sessionId).slice(0, 64).replace(NEWLINE_PATTERN, " ");
+      return new Error(`invalid_session_id: expected UUID format, got "${preview}"`);
+    }
     const validationErr = this.validateWorkspaceCwd();
     if (validationErr)
       return validationErr;
-    return { threadId: randomUUID(), workspace: this.workspace };
+    const id = sessionId ?? randomUUID();
+    this.assignedSessionId = id;
+    this.sessionId = sessionId ?? null;
+    return { sessionId: id, workspace: this.workspace };
   }
   async runTurn(session, prompt, _issue, onMessage) {
     const controller = new AbortController;
@@ -31713,16 +31733,30 @@ class AppServerClient {
     }
     if (this.sessionId) {
       options.resume = this.sessionId;
+    } else if (this.assignedSessionId) {
+      options.sessionId = this.assignedSessionId;
     }
     if (this.config.claude.command !== "claude") {
       options.pathToClaudeCodeExecutable = this.config.claude.command;
     }
+    if (this.config.claude.model) {
+      options.model = this.config.claude.model;
+    }
+    const sp = this.config.claude.system_prompt;
+    if (sp.type === "custom") {
+      options.systemPrompt = sp.value;
+    } else {
+      options.systemPrompt = sp;
+    }
     const toolSpecs = getToolSpecs(this.config);
     if (toolSpecs.length > 0) {
       options.mcpServers = {
         "work-please-tools": createToolsMcpServer(this.config)
       };
     }
+    if (this.config.claude.setting_sources.length > 0) {
+      options.settingSources = this.config.claude.setting_sources;
+    }
     const turnId = randomUUID();
     let sessionId = null;
     let gotError = false;
@@ -31734,11 +31768,11 @@ class AppServerClient {
           const initMsg = msg;
           sessionId = initMsg.session_id;
           this.sessionId = sessionId;
+          this.assignedSessionId = null;
           onMessage({
             event: "session_started",
             timestamp: new Date,
             session_id: sessionId,
-            thread_id: session.threadId,
             turn_id: turnId
           });
         } else if (msg.type === "result") {
@@ -31791,12 +31825,18 @@ class AppServerClient {
         });
         return err;
       }
-      return { thread_id: session.threadId, turn_id: turnId, session_id: sessionId };
+      return { turn_id: turnId, session_id: sessionId };
     } catch (err) {
       clearTimeout(timeoutHandle);
       const error48 = err instanceof Error ? err : new Error(String(err));
+      if (!sessionId) {
+        if (!options.resume) {
+          this.sessionId = null;
+          this.assignedSessionId = null;
+        }
+      }
       onMessage({
-        event: "startup_failed",
+        event: sessionId ? "turn_failed" : "startup_failed",
         timestamp: new Date,
         payload: { reason: error48.message }
       });
@@ -31805,6 +31845,7 @@ class AppServerClient {
   }
   stopSession() {
     this.abortController?.abort();
+    this.assignedSessionId = null;
     this.sessionId = null;
     this.abortController = null;
   }
@@ -31825,6 +31866,7 @@ import { tmpdir } from "os";
 import { join, sep as sep2 } from "path";
 import process4 from "process";
 var ENV_VAR_RE = /^\$([A-Z_]\w*)$/i;
+var VALID_SETTING_SOURCES = new Set(["user", "project", "local"]);
 var DEFAULTS2 = {
   POLL_INTERVAL_MS: 30000,
   WORKSPACE_ROOT: join(tmpdir(), "work-please_workspaces"),
@@ -31835,6 +31877,7 @@ var DEFAULTS2 = {
   CLAUDE_COMMAND: "claude",
   CLAUDE_PERMISSION_MODE: "bypassPermissions",
   CLAUDE_ALLOWED_TOOLS: [],
+  CLAUDE_SETTING_SOURCES: ["project", "local", "user"],
   CLAUDE_TURN_TIMEOUT_MS: 3600000,
   CLAUDE_READ_TIMEOUT_MS: 5000,
   CLAUDE_STALL_TIMEOUT_MS: 300000,
@@ -31876,19 +31919,33 @@ function buildConfig(workflow) {
       max_retry_backoff_ms: posIntValue(agent.max_retry_backoff_ms, DEFAULTS2.MAX_RETRY_BACKOFF_MS),
       max_concurrent_agents_by_state: stateLimitsValue(agent.max_concurrent_agents_by_state)
     },
-    claude: {
-      command: commandValue(claude.command) ?? DEFAULTS2.CLAUDE_COMMAND,
-      permission_mode: stringValue(claude.permission_mode) ?? DEFAULTS2.CLAUDE_PERMISSION_MODE,
-      allowed_tools: stringArrayValue(claude.allowed_tools, DEFAULTS2.CLAUDE_ALLOWED_TOOLS),
-      turn_timeout_ms: intValue(claude.turn_timeout_ms, DEFAULTS2.CLAUDE_TURN_TIMEOUT_MS),
-      read_timeout_ms: intValue(claude.read_timeout_ms, DEFAULTS2.CLAUDE_READ_TIMEOUT_MS),
-      stall_timeout_ms: intValue(claude.stall_timeout_ms, DEFAULTS2.CLAUDE_STALL_TIMEOUT_MS)
-    },
+    claude: buildClaudeConfig(claude),
     server: {
       port: nonNegIntOrNull(server.port)
     }
   };
 }
+function buildClaudeConfig(claude) {
+  const settingsSec = sectionMap(claude, "settings");
+  const attributionSec = sectionMap(settingsSec, "attribution");
+  return {
+    model: stringValue(claude.model),
+    command: commandValue(claude.command) ?? DEFAULTS2.CLAUDE_COMMAND,
+    permission_mode: stringValue(claude.permission_mode) ?? DEFAULTS2.CLAUDE_PERMISSION_MODE,
+    allowed_tools: stringArrayValue(claude.allowed_tools, DEFAULTS2.CLAUDE_ALLOWED_TOOLS),
+    setting_sources: stringArrayValue(claude.setting_sources, DEFAULTS2.CLAUDE_SETTING_SOURCES).filter((s2) => VALID_SETTING_SOURCES.has(s2)),
+    turn_timeout_ms: intValue(claude.turn_timeout_ms, DEFAULTS2.CLAUDE_TURN_TIMEOUT_MS),
+    read_timeout_ms: intValue(claude.read_timeout_ms, DEFAULTS2.CLAUDE_READ_TIMEOUT_MS),
+    stall_timeout_ms: intValue(claude.stall_timeout_ms, DEFAULTS2.CLAUDE_STALL_TIMEOUT_MS),
+    system_prompt: systemPromptValue(claude.system_prompt),
+    settings: {
+      attribution: {
+        commit: stringValue(attributionSec.commit),
+        pr: stringValue(attributionSec.pr)
+      }
+    }
+  };
+}
 function buildTrackerConfig(kind, tracker) {
   const label_prefix = stringValue(tracker.label_prefix) ?? null;
   const filter = buildFilterConfig(sectionMap(tracker, "filter"));
@@ -32002,6 +32059,26 @@ function maxConcurrentForState(config2, state) {
   const byState = config2.agent.max_concurrent_agents_by_state;
   return byState[normalized] ?? config2.agent.max_concurrent_agents;
 }
+var DEFAULT_SYSTEM_PROMPT = { type: "preset", preset: "claude_code" };
+function systemPromptValue(val) {
+  if (val == null)
+    return DEFAULT_SYSTEM_PROMPT;
+  if (typeof val === "string") {
+    const trimmed = val.trim();
+    return trimmed ? { type: "custom", value: trimmed } : DEFAULT_SYSTEM_PROMPT;
+  }
+  if (typeof val === "object" && !Array.isArray(val)) {
+    const obj = val;
+    if (obj.type === "preset" && obj.preset === "claude_code") {
+      return typeof obj.append === "string" ? { type: "preset", preset: "claude_code", append: obj.append } : { type: "preset", preset: "claude_code" };
+    }
+    if (obj.type === "custom" && typeof obj.value === "string") {
+      const trimmed = obj.value.trim();
+      return trimmed ? { type: "custom", value: trimmed } : DEFAULT_SYSTEM_PROMPT;
+    }
+  }
+  return DEFAULT_SYSTEM_PROMPT;
+}
 function sectionMap(raw, key) {
   const val = raw[key];
   return val && typeof val === "object" && !Array.isArray(val) ? val : {};
@@ -32066,7 +32143,7 @@ function csvValue(val) {
 function stringArrayValue(val, fallback) {
   if (!Array.isArray(val))
     return fallback;
-  return val.filter((v) => typeof v === "string");
+  return val.filter((v) => typeof v === "string" && v.trim().length > 0);
 }
 function stateLimitsValue(val) {
   if (!val || typeof val !== "object" || Array.isArray(val))
@@ -36929,6 +37006,7 @@ function issueToTemplateVars(issue2) {
     url: issue2.url,
     labels: issue2.labels,
     blocked_by: issue2.blocked_by,
+    pull_requests: issue2.pull_requests,
     created_at: issue2.created_at?.toISOString() ?? null,
     updated_at: issue2.updated_at?.toISOString() ?? null
   };
@@ -37091,6 +37169,7 @@ function createAsanaAdapter(config2) {
           assignees: [],
           labels: [],
           blocked_by: [],
+          pull_requests: [],
           created_at: null,
           updated_at: null
         });
@@ -37121,6 +37200,7 @@ function normalizeAsanaTask(task, sectionName) {
     assignees,
     labels,
     blocked_by: blockedBy,
+    pull_requests: [],
     created_at: task.created_at ? new Date(String(task.created_at)) : null,
     updated_at: task.modified_at ? new Date(String(task.modified_at)) : null
   };
@@ -37184,12 +37264,16 @@ function createGitHubAdapter(config2) {
                     labels(first: 20) { nodes { name } }
                     assignees(first: 10) { nodes { login } }
                     createdAt updatedAt
+                    closedByPullRequestsReferences(first: 10, includeClosedPrs: true) {
+                      nodes { number title url state headRefName }
+                    }
                   }
                   ... on PullRequest {
                     number title body url
                     labels(first: 20) { nodes { name } }
                     assignees(first: 10) { nodes { login } }
                     createdAt updatedAt
+                    headRefName
                   }
                 }
               }
@@ -37216,12 +37300,16 @@ function createGitHubAdapter(config2) {
                     labels(first: 20) { nodes { name } }
                     assignees(first: 10) { nodes { login } }
                     createdAt updatedAt
+                    closedByPullRequestsReferences(first: 10, includeClosedPrs: true) {
+                      nodes { number title url state headRefName }
+                    }
                   }
                   ... on PullRequest {
                     number title body url
                     labels(first: 20) { nodes { name } }
                     assignees(first: 10) { nodes { login } }
                     createdAt updatedAt
+                    headRefName
                   }
                 }
               }
@@ -37253,12 +37341,16 @@ function createGitHubAdapter(config2) {
                   labels(first: 20) { nodes { name } }
                   assignees(first: 10) { nodes { login } }
                   createdAt updatedAt
+                  closedByPullRequestsReferences(first: 10, includeClosedPrs: true) {
+                    nodes { number title url state headRefName }
+                  }
                 }
                 ... on PullRequest {
                   number title body url
                   labels(first: 20) { nodes { name } }
                   assignees(first: 10) { nodes { login } }
                   createdAt updatedAt
+                  headRefName
                 }
               }
             }
@@ -37386,6 +37478,10 @@ function buildQueryString(filter2) {
     parts.push(`label:${filter2.label.join(",")}`);
   return parts.join(" ");
 }
+function normalizePrState(raw2) {
+  const s2 = String(raw2 ?? "").toLowerCase();
+  return s2 === "closed" || s2 === "merged" ? s2 : "open";
+}
 function normalizeProjectItem(node, status) {
   const content = node.content;
   const number4 = content?.number;
@@ -37393,6 +37489,15 @@ function normalizeProjectItem(node, status) {
   const labels = Array.isArray(content?.labels?.nodes) ? content.labels.nodes.map((l) => (l.name ?? "").toLowerCase()).filter(Boolean) : [];
   const assigneeNodes = content?.assignees?.nodes;
   const assignees = Array.isArray(assigneeNodes) ? assigneeNodes.map((n2) => n2.login ?? "").filter(Boolean) : [];
+  const prRefNodes = content?.closedByPullRequestsReferences?.nodes;
+  const pullRequests = Array.isArray(prRefNodes) ? prRefNodes.filter((pr) => pr !== null && typeof pr === "object" && typeof pr.number === "number" && pr.number > 0).map((pr) => ({
+    number: pr.number,
+    title: String(pr.title ?? ""),
+    url: pr.url ? String(pr.url) : null,
+    state: normalizePrState(pr.state),
+    branch_name: pr.headRefName ? String(pr.headRefName) : null
+  })) : [];
+  const headRefName = content?.headRefName ? String(content.headRefName) : null;
   return {
     id: String(node.id ?? ""),
     identifier,
@@ -37400,11 +37505,12 @@ function normalizeProjectItem(node, status) {
     description: content?.body ? String(content.body) : null,
     priority: null,
     state: status,
-    branch_name: null,
+    branch_name: headRefName,
     url: content?.url ? String(content.url) : null,
     assignees,
     labels,
     blocked_by: [],
+    pull_requests: pullRequests,
     created_at: content?.createdAt ? new Date(String(content.createdAt)) : null,
     updated_at: content?.updatedAt ? new Date(String(content.updatedAt)) : null
   };
@@ -40140,9 +40246,28 @@ function isWorkflowError(result) {
 }
 
 // src/workspace.ts
-import { existsSync as existsSync4, lstatSync as lstatSync2, mkdirSync as mkdirSync2, rmSync as rmSync2, statSync as statSync3 } from "fs";
-import { join as join4, resolve as resolve4, sep as sep4 } from "path";
+import { existsSync as existsSync4, lstatSync as lstatSync2, mkdirSync as mkdirSync2, rmSync as rmSync2, statSync as statSync3, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname2, join as join4, resolve as resolve4, sep as sep4 } from "path";
 import process6 from "process";
+var CLAUDE_SETTINGS_PATH = ".claude/settings.local.json";
+var WORK_PLEASE_URL = "https://github.com/pleaseai/work-please";
+var ATTRIBUTION_TEXT = `\uD83D\uDE4F Generated with [Work Please](${WORK_PLEASE_URL})`;
+function generateClaudeSettings(attribution) {
+  return `${JSON.stringify({
+    attribution: {
+      commit: attribution?.commit ?? ATTRIBUTION_TEXT,
+      pr: attribution?.pr ?? ATTRIBUTION_TEXT
+    }
+  }, null, 2)}
+`;
+}
+function ensureClaudeSettings(wsPath, attribution) {
+  const settingsPath = join4(wsPath, CLAUDE_SETTINGS_PATH);
+  if (existsSync4(settingsPath))
+    return;
+  mkdirSync2(dirname2(settingsPath), { recursive: true });
+  writeFileSync2(settingsPath, generateClaudeSettings(attribution), "utf-8");
+}
 var _git = {
   spawnSync: (args) => Bun.spawnSync(args)
 };
@@ -40275,6 +40400,11 @@ async function createWorkspace(config2, identifier, issue2) {
         if (hookErr)
           return hookErr;
       }
+      try {
+        ensureClaudeSettings(wtPath, config2.claude.settings.attribution);
+      } catch (err) {
+        return err instanceof Error ? err : new Error(String(err));
+      }
       return { path: wtPath, workspace_key: key, created_now: createdNow };
     }
   }
@@ -40305,6 +40435,11 @@ async function createWorkspace(config2, identifier, issue2) {
     if (hookErr)
       return hookErr;
   }
+  try {
+    ensureClaudeSettings(wsPath, config2.claude.settings.attribution);
+  } catch (err) {
+    return err instanceof Error ? err : new Error(String(err));
+  }
   return workspace;
 }
 async function removeWorkspace(config2, identifier, issue2) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pleaseai/work",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Symphony-spec orchestrator for Claude Code + Asana/GitHub Projects v2",
   "license": "FSL-1.1-MIT",
   "repository": {