feat: resume fully planned drafts across devices (Closes #859)
CI / lint (pull_request) Successful in 1m52s
CI / build-release (pull_request) Successful in 6s
CI / release-candidate (pull_request) Has been skipped

This commit is contained in:
timmy committed 2026-08-15 00:07:32 +00:00
1 parent 7cab4e8749
commit f23839f2b9
10 files changed
+380 -30

No files matched your search

+13 -1
View File
@@ -152,6 +152,8 @@ function createIssueCapture({ fetchJson, storage, createOperationId = newIssueOp
const safeMilestoneId = value => Number.isInteger(Number(value)) && Number(value) > 0 ? Number(value) : null;
const safeDueDate = value => /^\d{4}-\d{2}-\d{2}$/.test(String(value || '')) ? String(value) : '';
const safeAssignee = value => /^[A-Za-z0-9_.-]+$/.test(String(value || '')) ? String(value) : '';
const safeEstimate = value => Number.isInteger(Number(value)) && Number(value) >= 5 && Number(value) <= 1440 ?
Number(value) : null;
function loadStored() {
try {
@@ -179,6 +181,11 @@ function createIssueCapture({ fetchJson, storage, createOperationId = newIssueOp
const dueDate = safeDueDate(parsed.dueDate);
if (milestoneId !== null) draft.milestoneId = milestoneId;
if (dueDate) draft.dueDate = dueDate;
const estimateMinutes = safeEstimate(parsed.estimateMinutes);
if (estimateMinutes !== null) draft.estimateMinutes = estimateMinutes;
if (['create', 'create-and-start'].includes(parsed.completionIntent)) {
draft.completionIntent = parsed.completionIntent;
}
const blockers = safeBlockers(parsed.blockers);
if (blockers.length) draft.blockers = blockers;
return draft;
@@ -215,10 +222,15 @@ function createIssueCapture({ fetchJson, storage, createOperationId = newIssueOp
const dueDate = safeDueDate(draft?.dueDate);
if (milestoneId !== null) safe.milestoneId = milestoneId;
if (dueDate) safe.dueDate = dueDate;
const estimateMinutes = safeEstimate(draft?.estimateMinutes);
if (estimateMinutes !== null) safe.estimateMinutes = estimateMinutes;
if (['create', 'create-and-start'].includes(draft?.completionIntent)) {
safe.completionIntent = draft.completionIntent;
}
const blockers = safeBlockers(draft?.blockers);
if (blockers.length) safe.blockers = blockers;
const unchanged = ['repository', 'title', 'body', 'milestoneId', 'dueDate', 'assignee', 'assigneeName', 'unassigned',
'templateName', 'templateId', 'capturedBody']
'templateName', 'templateId', 'capturedBody', 'estimateMinutes', 'completionIntent']
.every(key => (previous[key] || '') === (safe[key] || '')) &&
JSON.stringify(previous.labelIds) === JSON.stringify(safe.labelIds) &&
JSON.stringify(previous.blockers || []) === JSON.stringify(safe.blockers || []);
+12 -18
View File
@@ -1603,7 +1603,7 @@
qs('#create-issue-estimate-status').textContent = createAndStart.capacityMessage(result);
return result;
}
qs('#create-issue-estimate').addEventListener('input', renderCreateStartCapacity);
qs('#create-issue-estimate').addEventListener('input', () => { renderCreateStartCapacity(); saveIssueCaptureDraft(); });
const queueToday = createQueueToday({
todayWork,
@@ -2502,7 +2502,7 @@
function listDrafts() {
const unfiled = unfiledCaptures.list().map(item => ({
id:'unfiled:' + item.id, capture_id:item.id, kind:'unfiled-issue', label:'Needs filing',
id:'unfiled:' + item.id, capture_id:item.id, kind:'unfiled-issue', ...unfiledDraftSummary(item),
title:item.title, preview:item.body + (item.hasAttachment ? ' · Screenshot attached' : ''),
hasAttachment:item.hasAttachment, copy_text:[item.title, item.body].filter(Boolean).join('\n\n'),
updated_at:item.savedAt, quarantined:item.quarantined,
@@ -3712,15 +3712,13 @@
let issueCaptureBlockers = [];
function saveIssueCaptureDraft() {
if (issueCapture) issueCapture.saveDraft(issueTemplatePicker.fields(
issueOwnerPicker.draft(selectedIssueLabelIds(), issueCaptureBlockers)
));
if (issueCapture) issueCapture.saveDraft(currentIssueCaptureDraft(false));
}
function currentIssueCaptureDraft() {
return issueTemplatePicker.fields(
issueOwnerPicker.draft(selectedIssueLabelIds(), issueCaptureBlockers, true)
);
function currentIssueCaptureDraft(trim = true) {
return withFilingEstimate(issueTemplatePicker.fields(
issueOwnerPicker.draft(selectedIssueLabelIds(), issueCaptureBlockers, trim)
), qs('#create-issue-estimate').value);
}
let issueCaptureRepositories = [];
@@ -3932,6 +3930,7 @@
setIssueFilingMode(Boolean(captureDraft.repository));
qs('#create-issue-capture-status').textContent = '';
qs('#create-issue-due-date').value = captureDraft.dueDate || '';
qs('#create-issue-estimate').value = captureDraft.estimateMinutes || '';
issueOwnerPicker.reset(captureDraft.repository, captureDraft);
renderIssueCaptureBlockers(captureDraft.blockers || []);
qs('#create-issue-blocker-search').value = '';
@@ -3961,9 +3960,7 @@
}
function setIssueFilingMode(enabled) {
qs('#create-issue-filing').hidden = !enabled;
qs('.create-issue-capture-actions').hidden = enabled;
qs('#create-issue-heading').textContent = enabled ? 'File issue' : 'Capture work';
applyIssueFilingMode(qs, enabled);
}
let suppressCreateDraftOnHistoryClose = false;
@@ -5058,11 +5055,8 @@
qs('#save-unfiled-issue').addEventListener('click', async () => {
try {
const evidence = await createIssueAttachmentController.serialize();
const captureDraft = {
title: qs('#create-issue-title').value.trim(),
body: qs('#create-issue-body').value.trim(),
...(Array.isArray(evidence) ? {attachments:evidence} : {attachment:evidence}),
};
const captureDraft = currentIssueCaptureDraft();
Object.assign(captureDraft, Array.isArray(evidence) ? {attachments:evidence} : {attachment:evidence});
if (showDraftCapacityDialog(unfiledCaptures)) return;
const savedCapture = await unfiledCaptures.save(captureDraft);
if (rUC) {
@@ -5082,7 +5076,7 @@
savedCard?.scrollIntoView({block:'nearest'});
savedCard?.focus({preventScroll:true});
});
qs('#my-work-action-status').textContent = 'Saved to Drafts. Choose a repository when you’re ready to file it.';
qs('#my-work-action-status').textContent = unfiledSavedMessage(captureDraft);
} catch (error) {
qs('#create-issue-capture-status').textContent = error.message;
qs('#create-issue-title').focus();
+4 -4
View File
@@ -40,10 +40,10 @@ function bindDraftCapacityDialog() {
const button = qs('#replace-oldest-draft');
button.disabled = true;
try {
const draft = {
title:qs('#create-issue-title').value.trim(), body:qs('#create-issue-body').value.trim(),
attachment:await createIssueAttachmentController.serialize(),
};
const draft = currentIssueCaptureDraft();
const evidence = await createIssueAttachmentController.serialize();
Object.assign(draft,
Array.isArray(evidence) ? {attachments:evidence} : {attachment:evidence});
const saved = await unfiledCaptures.replaceOldest(draft, oldest.id);
qs('#draft-capacity-sheet').hidden = true;
issueCapture.clearDraft();
+2 -1
View File
@@ -54,7 +54,8 @@ function createDraftFilingSession({list}) {
dependencies.issueCapture.saveDraft(resumed);
dependencies.setResumedId(captureId);
await dependencies.openSheet();
dependencies.attachment[resumed.attachment ? 'restore' : 'clear'](resumed.attachment);
const evidence = resumed.attachments || resumed.attachment;
dependencies.attachment[evidence ? 'restore' : 'clear'](evidence);
dependencies.setFilingMode(true);
session.render();
};
+80 -2
View File
@@ -1,3 +1,25 @@
function withFilingEstimate(draft, value) {
draft.estimateMinutes = Number(value) || null;
return draft;
}
function unfiledDraftSummary(item) {
return {label:item.filingPlan?.repository ? 'Ready to file' : 'Needs filing',
repository:item.filingPlan?.repository || ''};
}
function unfiledSavedMessage(item) {
return item.repository ? 'Saved planned Draft. Resume on any signed-in device.' :
'Saved to Drafts. Choose a repository when you’re ready to file it.';
}
function applyIssueFilingMode(qs, enabled) {
qs('#create-issue-filing').hidden = !enabled;
qs('.create-issue-capture-actions').hidden = false;
qs('#file-new-issue').hidden = enabled;
qs('#create-issue-heading').textContent = enabled ? 'File issue' : 'Capture work';
}
function createUnfiledCaptures({
storage,
attachmentStore = null,
@@ -37,6 +59,56 @@ function createUnfiledCaptures({
return {full:items.length >= maxItems, count:items.length, maxItems, oldest:items.at(-1) || null};
}
function filingPlan(value = {}, remote = false) {
const get = (local, wire) => value?.[remote ? wire : local];
const repository = String(get('repository', 'repository') || '').trim();
if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(repository)) return null;
const labelIds = Array.from(new Set((Array.isArray(get('labelIds', 'label_ids')) ?
get('labelIds', 'label_ids') : []).filter(id => Number.isInteger(id) && id > 0))).slice(0, 20);
const plan = {repository, labelIds};
const milestoneId = Number(get('milestoneId', 'milestone_id'));
if (Number.isInteger(milestoneId) && milestoneId > 0) plan.milestoneId = milestoneId;
const dueDate = String(get('dueDate', 'due_date') || '');
if (/^\d{4}-\d{2}-\d{2}$/.test(dueDate)) plan.dueDate = dueDate;
const bounded = (local, wire, limit) => {
const text = String(get(local, wire) || '').trim();
if (text) plan[local] = text.slice(0, limit);
};
bounded('templateName', 'template_name', 80);
bounded('templateId', 'template_id', 80);
bounded('capturedBody', 'captured_body', 10000);
if (get('unassigned', 'unassigned') === true) plan.unassigned = true;
const assignee = String(get('assignee', 'assignee') || '').trim();
if (!plan.unassigned && /^[A-Za-z0-9_.-]+$/.test(assignee)) {
plan.assignee = assignee;
bounded('assigneeName', 'assignee_name', 255);
}
const estimateMinutes = Number(get('estimateMinutes', 'estimate_minutes'));
if (Number.isInteger(estimateMinutes) && estimateMinutes >= 5 && estimateMinutes <= 1440) {
plan.estimateMinutes = estimateMinutes;
}
const completionIntent = String(get('completionIntent', 'completion_intent') || '');
if (['create', 'create-and-start'].includes(completionIntent)) plan.completionIntent = completionIntent;
return plan;
}
function exportFilingPlan(plan) {
if (!plan) return null;
return {
repository:plan.repository, label_ids:plan.labelIds,
...(plan.milestoneId ? {milestone_id:plan.milestoneId} : {}),
...(plan.dueDate ? {due_date:plan.dueDate} : {}),
...(plan.templateName ? {template_name:plan.templateName} : {}),
...(plan.templateId ? {template_id:plan.templateId} : {}),
...(plan.capturedBody ? {captured_body:plan.capturedBody} : {}),
...(plan.unassigned ? {unassigned:true} : {}),
...(plan.assignee ? {assignee:plan.assignee} : {}),
...(plan.assigneeName ? {assignee_name:plan.assigneeName} : {}),
...(plan.estimateMinutes ? {estimate_minutes:plan.estimateMinutes} : {}),
...(plan.completionIntent ? {completion_intent:plan.completionIntent} : {}),
};
}
function prepare(note) {
const title = String(note?.title || '').trim().slice(0, 255);
const body = String(note?.body || '').trim().slice(0, 10000);
@@ -75,6 +147,7 @@ function createUnfiledCaptures({
}, []);
return {
title, body, ownerLogin, attachment, attachments, blockers,
filingPlan:filingPlan(note),
hasAttachment:hasAttachment || validAttachments,
attachmentCount:validAttachments ? attachments.length : (hasAttachment ? 1 : 0),
};
@@ -87,7 +160,7 @@ function createUnfiledCaptures({
hasAttachment:true, attachmentCount:prepared.attachmentCount,
} : {}), ...(prepared.blockers.length ? {
blockers:prepared.blockers, blockerCount:prepared.blockers.length,
} : {}),
} : {}), ...(prepared.filingPlan ? {filingPlan:prepared.filingPlan} : {}),
};
const items = [item, ...existing.filter(candidate => candidate.id !== item.id)];
const writeItems = () => {
@@ -175,7 +248,7 @@ function createUnfiledCaptures({
if (!confirmedLogin || String(confirmedLogin).trim() !== item.ownerLogin) {
throw new Error('Reconnect with the account that saved this capture.');
}
const draft = {repository:'', title:item.title, body:item.body, labelIds:[],
const draft = {...(item.filingPlan || {repository:'', labelIds:[]}), title:item.title, body:item.body,
...(Array.isArray(item.blockers) && item.blockers.length ? {blockers:item.blockers} : {})};
if (!item.hasAttachment) return draft;
if (!attachmentStore) throw new Error('The saved screenshot is unavailable. Retry after reloading.');
@@ -233,6 +306,7 @@ function createUnfiledCaptures({
}
exported.push({
id:item.id, title:item.title, body:item.body, saved_at:Number(item.savedAt),
...(item.filingPlan ? {filing_plan:exportFilingPlan(item.filingPlan)} : {}),
...(Array.isArray(item.blockers) && item.blockers.length ? {blockers:item.blockers} : {}),
...(evidence.length ? {evidence} : {}),
});
@@ -250,9 +324,11 @@ function createUnfiledCaptures({
if (!remote || known.has(remote.id) || imported.length + existing.length >= maxItems) continue;
const evidence = Array.isArray(remote.evidence) ? remote.evidence : [];
if (evidence.length && !attachmentStore) continue;
const plan = filingPlan(remote.filing_plan, true);
const item = {
id:String(remote.id), ownerLogin, title:String(remote.title || ''), body:String(remote.body || ''),
savedAt:Number(remote.saved_at),
...(plan ? {filingPlan:plan} : {}),
...(Array.isArray(remote.blockers) && remote.blockers.length ? {
blockers:remote.blockers, blockerCount:remote.blockers.length,
} : {}),
@@ -286,9 +362,11 @@ function createUnfiledCaptures({
if (evidence.length && !attachmentStore) {
throw new Error('The synchronized screenshots cannot be stored on this device.');
}
const plan = filingPlan(remote.filing_plan, true);
const item = {
id:String(remote.id || ''), ownerLogin, title:String(remote.title || ''), body:String(remote.body || ''),
savedAt:Number(remote.saved_at),
...(plan ? {filingPlan:plan} : {}),
...(Array.isArray(remote.blockers) && remote.blockers.length ? {
blockers:remote.blockers, blockerCount:remote.blockers.length,
} : {}),