teamcopilot 0.3.6 → 0.4.1

package/dist/chat/index.js

@@ -9,9 +9,6 @@ const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
 const client_1 = __importDefault(require("../prisma/client"));
 const index_1 = require("../utils/index");
-const resource_access_1 = require("../utils/resource-access");
-const skill_1 = require("../utils/skill");
-const secrets_1 = require("../utils/secrets");
 const opencode_client_1 = require("../utils/opencode-client");
 const chat_session_1 = require("../utils/chat-session");
 const assert_1 = require("../utils/assert");
@@ -19,9 +16,10 @@ const redact_1 = require("../utils/redact");
 const session_abort_1 = require("../utils/session-abort");
 const chat_session_file_diff_1 = require("../utils/chat-session-file-diff");
 const chat_usage_1 = require("../utils/chat-usage");
+const scheduler_1 = require("../cronjobs/scheduler");
+const chat_prompt_context_1 = require("../utils/chat-prompt-context");
 const router = express_1.default.Router({ mergeParams: true });
 const USER_INSTRUCTIONS_FILENAME = "USER_INSTRUCTIONS.md";
-const ACTUAL_USER_MESSAGE_MARKER = "####### Actual user message below #######";
 function getErrorMessage(error) {
     if (error && typeof error === 'object' && 'detail' in error) {
         return String(error.detail);
@@ -121,46 +119,6 @@ async function readWorkspaceUserInstructions() {
         throw new Error(`Failed to read ${USER_INSTRUCTIONS_FILENAME}: ${nodeError.message}`);
     }
 }
-async function buildAvailableSkillsPrompt(userId) {
-    const slugs = (0, skill_1.listSkillSlugs)();
-    if (slugs.length === 0) {
-        return null;
-    }
-    const availableSkills = (await Promise.all(slugs.map(async (slug) => {
-        const accessSummary = await (0, resource_access_1.getResourceAccessSummary)("skill", slug, userId);
-        if (!accessSummary.can_view || !accessSummary.is_approved) {
-            return null;
-        }
-        const { manifest } = await (0, skill_1.readSkillManifestAndEnsurePermissions)(slug);
-        return {
-            path: `.agents/skills/${slug}`,
-            slug,
-            name: manifest.name,
-            description: manifest.description,
-        };
-    }))).filter((skill) => skill !== null);
-    if (availableSkills.length === 0) {
-        return null;
-    }
-    const skillLines = availableSkills.map((skill, index) => `${index + 1}. ${skill.name} (${skill.slug})\n   path: ${skill.path}\n   description: ${skill.description || "(no description provided)"}`);
-    return `# Available custom skills\n\nThese custom skills are available to you for this session (this is also the result of calling listAvailableSkills at this point in time). Use getSkillContent tool for a specific skill when you need to inspect its SKILL.md before using it.\n\n${skillLines.join("\n\n")}`;
-}
-async function buildAvailableSecretsPrompt(userId) {
-    const secretMap = await (0, secrets_1.listResolvedSecretsForUser)(userId);
-    const keys = Object.keys(secretMap);
-    if (keys.length === 0) {
-        return null;
-    }
-    return [
-        "# Available secrets for this user",
-        "",
-        "These secret keys are available to the current user for this session. Reuse these exact keys when creating or editing skills and workflows whenever they fit the need.",
-        "When referring to a secret in skill content or bash commands, use the proxy placeholder format {{SECRET:KEY}} instead of a raw value.",
-        "If you create a skill or workflow that needs a new secret key not listed here, you may introduce that new key, but you must tell the user to add it in their Profile Secrets before the skill or workflow can be used.",
-        "",
-        `Available secret keys: ${keys.join(", ")}`,
-    ].join("\n");
-}
 async function writeWorkspaceUserInstructions(content) {
     const workspaceDir = (0, opencode_client_1.getWorkspaceDir)();
     const userInstructionsPath = path_1.default.join(workspaceDir, USER_INSTRUCTIONS_FILENAME);
@@ -173,11 +131,11 @@ async function writeWorkspaceUserInstructions(content) {
     }
 }
 function stripTextBeforeActualUserMarker(text) {
-    const markerIndex = text.indexOf(ACTUAL_USER_MESSAGE_MARKER);
+    const markerIndex = text.indexOf(chat_prompt_context_1.ACTUAL_USER_MESSAGE_MARKER);
     if (markerIndex === -1) {
         return text;
     }
-    return text.slice(markerIndex + ACTUAL_USER_MESSAGE_MARKER.length).replace(/^\s+/, "");
+    return text.slice(markerIndex + chat_prompt_context_1.ACTUAL_USER_MESSAGE_MARKER.length).replace(/^\s+/, "");
 }
 function sanitizeFirstUserMessageForClient(messages) {
     const firstUserMessageId = messages.find((message) => {
@@ -196,7 +154,7 @@ function sanitizeFirstUserMessageForClient(messages) {
             return false;
         }
         const textPart = part;
-        return typeof textPart.text === "string" && textPart.text.includes(ACTUAL_USER_MESSAGE_MARKER);
+        return typeof textPart.text === "string" && textPart.text.includes(chat_prompt_context_1.ACTUAL_USER_MESSAGE_MARKER);
     });
     if (!hasMarker) {
         return messages;
@@ -217,7 +175,7 @@ function sanitizeFirstUserMessageForClient(messages) {
             if (markerFound) {
                 return part;
             }
-            const markerIndex = textPart.text.indexOf(ACTUAL_USER_MESSAGE_MARKER);
+            const markerIndex = textPart.text.indexOf(chat_prompt_context_1.ACTUAL_USER_MESSAGE_MARKER);
             if (markerIndex === -1) {
                 return {
                     ...textPart,
@@ -402,7 +360,10 @@ function getSessionState(args) {
 // GET /api/chat/sessions - List user's sessions
 router.get('/sessions', (0, index_1.apiHandler)(async (req, res) => {
     const sessions = await client_1.default.chat_sessions.findMany({
-        where: { user_id: req.userId },
+        where: {
+            user_id: req.userId,
+            visible_to_user: true,
+        },
         orderBy: { updated_at: 'desc' }
     });
     if (sessions.length === 0) {
@@ -422,7 +383,7 @@ router.get('/sessions', (0, index_1.apiHandler)(async (req, res) => {
         await client_1.default.chat_sessions.deleteMany({
             where: {
                 id: { in: staleSessionIds },
-                user_id: req.userId
+                user_id: req.userId,
             }
         });
     }
@@ -445,14 +406,36 @@ router.get('/sessions', (0, index_1.apiHandler)(async (req, res) => {
             opencode_session_id: true
         }
     });
+    const controllableCronjobRuns = await client_1.default.cronjob_runs.findMany({
+        where: {
+            session_id: { in: validSessions.map((session) => session.id) },
+            cronjob: { target_type: "prompt" },
+            status: { in: ["running", "paused"] },
+        },
+        orderBy: { started_at: "desc" },
+        select: {
+            id: true,
+            session_id: true,
+            status: true,
+        },
+    });
+    const controllableRunBySessionId = new Map();
+    for (const run of controllableCronjobRuns) {
+        (0, assert_1.assertCondition)(run.session_id, "Controllable cronjob run is missing chat session id");
+        if (controllableRunBySessionId.has(run.session_id))
+            continue;
+        controllableRunBySessionId.set(run.session_id, run);
+    }
     const enrichedSessions = await Promise.all(validSessions.map(async (session) => {
+        const controllableRun = controllableRunBySessionId.get(session.id);
         const latestAssistantMessageId = await loadLatestAssistantMessageIdForSession(client, session.opencode_session_id);
-        const hasPendingInput = latestAssistantMessageId !== null && (pendingQuestions.some((question) => question.sessionID === session.opencode_session_id
-            && question.messageID === latestAssistantMessageId)
-            || pendingPermissions.some((permission) => permission.sessionID === session.opencode_session_id
-                && permission.tool?.messageID === latestAssistantMessageId)
-            || customPendingPermissions.some((permission) => permission.opencode_session_id === session.opencode_session_id
-                && permission.message_id === latestAssistantMessageId));
+        const hasPendingInput = (0, chat_session_1.sessionHasPendingInputForLatestAssistantMessage)({
+            opencodeSessionId: session.opencode_session_id,
+            latestAssistantMessageId,
+            pendingQuestions,
+            pendingPermissions,
+            customPendingPermissions
+        });
         const rawSessionStatus = (0, chat_session_1.getSessionStatusTypeForSession)(sessionStatusMap, session.opencode_session_id);
         const sessionState = getSessionState({
             rawSessionStatus,
@@ -467,7 +450,16 @@ router.get('/sessions', (0, index_1.apiHandler)(async (req, res) => {
             created_at: session.created_at,
             updated_at: session.updated_at,
             state: sessionState.state,
-            latest_message_id: sessionState.latest_message_id
+            latest_message_id: sessionState.latest_message_id,
+            cronjob_control: controllableRun
+                ? {
+                    run_id: controllableRun.id,
+                    status: controllableRun.status,
+                    can_interrupt: controllableRun.status === "running",
+                    can_resume: controllableRun.status === "paused",
+                    can_terminate: true,
+                }
+                : null,
         };
     }));
     res.json({ sessions: enrichedSessions });
@@ -600,7 +592,7 @@ router.get('/sessions/:id', (0, index_1.apiHandler)(async (req, res) => {
         }
     });
 }, true));
-// POST /api/chat/sessions/file-diff/capture-baseline - Capture pre-apply_patch baseline for current opencode session
+// POST /api/chat/sessions/file-diff/capture-baseline - Capture pre-edit baseline for current opencode session
 router.post('/sessions/file-diff/capture-baseline', (0, index_1.apiHandler)(async (req, res) => {
     if (!req.opencode_session_id) {
         throw {
@@ -808,6 +800,21 @@ router.post('/sessions/:id/messages', (0, index_1.apiHandler)(async (req, res) =
             message: 'Session not found'
         };
     }
+    const terminalCronjobRun = await client_1.default.cronjob_runs.findFirst({
+        where: {
+            session_id: id,
+            cronjob: { target_type: "prompt" },
+            status: { in: ["success", "failed", "terminated", "skipped"] },
+        },
+        orderBy: { started_at: "desc" },
+        select: { status: true },
+    });
+    if (terminalCronjobRun) {
+        throw {
+            status: 409,
+            message: `This cronjob chat is closed because the run is ${terminalCronjobRun.status}. Start a new chat or rerun the cronjob.`
+        };
+    }
     const pendingQuestion = await (0, opencode_client_1.getPendingQuestionForSession)(session.opencode_session_id);
     if (pendingQuestion) {
         throw {
@@ -834,28 +841,26 @@ router.post('/sessions/:id/messages', (0, index_1.apiHandler)(async (req, res) =
     }
     if ((existingMessagesResult.data || []).length === 0) {
         const userInstructions = await readWorkspaceUserInstructions();
-        const availableSkillsPrompt = await buildAvailableSkillsPrompt(req.userId);
-        const availableSecretsPrompt = await buildAvailableSecretsPrompt(req.userId);
-        if (userInstructions || availableSkillsPrompt || availableSecretsPrompt) {
-            const preambleSections = [];
-            if (userInstructions) {
-                preambleSections.push(`# Custom user instructions (in case of conflicts, the instructions here take precedence over the contents of the AGENTS.md file)\n\n${userInstructions}`);
-            }
-            if (availableSkillsPrompt) {
-                preambleSections.push(availableSkillsPrompt);
-            }
-            if (availableSecretsPrompt) {
-                preambleSections.push(availableSecretsPrompt);
-            }
-            const wrappedUserInstructions = `${preambleSections.join("\n\n")}\n\n${ACTUAL_USER_MESSAGE_MARKER}\n\n`;
-            finalPromptParts = [
-                {
-                    type: "text",
-                    text: wrappedUserInstructions
-                },
-                ...promptParts
-            ];
+        const availableSkillsPrompt = await (0, chat_prompt_context_1.buildAvailableSkillsPrompt)(req.userId);
+        const availableSecretsPrompt = await (0, chat_prompt_context_1.buildAvailableSecretsPrompt)(req.userId);
+        const preambleSections = [(0, chat_prompt_context_1.buildCurrentTimePrompt)()];
+        if (userInstructions) {
+            preambleSections.push(`# Custom user instructions (in case of conflicts, the instructions here take precedence over the contents of the AGENTS.md file)\n\n${userInstructions}`);
+        }
+        if (availableSkillsPrompt) {
+            preambleSections.push(availableSkillsPrompt);
         }
+        if (availableSecretsPrompt) {
+            preambleSections.push(availableSecretsPrompt);
+        }
+        const wrappedUserInstructions = `${preambleSections.join("\n\n")}\n\n${chat_prompt_context_1.ACTUAL_USER_MESSAGE_MARKER}\n\n`;
+        finalPromptParts = [
+            {
+                type: "text",
+                text: wrappedUserInstructions
+            },
+            ...promptParts
+        ];
     }
     // Use promptAsync to send message and return immediately
     const result = await client.session.promptAsync({
@@ -1079,9 +1084,27 @@ router.post('/sessions/:id/abort', (0, index_1.apiHandler)(async (req, res) => {
             message: 'Session not found'
         };
     }
-    await (0, session_abort_1.abortOpencodeSession)(session.opencode_session_id);
+    const runningCronRun = await client_1.default.cronjob_runs.findFirst({
+        where: {
+            session_id: id,
+            status: "running",
+        },
+        select: {
+            id: true,
+            status: true,
+            opencode_session_id: true,
+            workflow_run_id: true,
+        },
+    });
+    if (runningCronRun) {
+        await (0, scheduler_1.interruptCronjobRun)(runningCronRun.id);
+    }
+    else {
+        await (0, session_abort_1.abortOpencodeSession)(session.opencode_session_id);
+    }
     res.json({
-        success: true
+        success: true,
+        cronjob_run_id: runningCronRun?.id ?? null,
     });
 }, true));
 // GET /api/chat/sessions/:id/events - SSE stream for real-time updates

package/dist/cronjob/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startCronJobs = startCronJobs;
 const cron_1 = require("cron");
 const resource_reconciliation_1 = require("./resource-reconciliation");
+const scheduler_1 = require("../cronjobs/scheduler");
 let isCronStarted = false;
 function startCronJobs() {
     if (isCronStarted) {
@@ -13,4 +14,5 @@ function startCronJobs() {
         void (0, resource_reconciliation_1.reconcileResourceMetadataWithFilesystem)();
     });
     resourceReconciliationJob.start();
+    void (0, scheduler_1.startUserCronjobScheduler)();
 }